Merge branch 'mc-4.6'

Merge Changelog entry about pascal syntax highlighting Conflicts: ChangeLog
2009-01-11 14:51:03 +01:00 · 2009-01-11 14:51:03 +01:00 · dab3fd8abf
--- a/5
+++ b/5
@ -1,3 +1,8 @@
+2009-01-11 Patrick Winnertz <winnie@debian.org>
+
+  * syntax/pascal.syntax: Added syntax highlighting for 
+  some delphi keywords
+
 2009-01-10  Enrico Weigelt, metux ITS <weigelt@metux.de>

 	* syntax/Makefile.am syntax/Syntax syntax/haskell.syntax: