--- alx-src/branches/alxconf-060/ChangeLog	2011/08/11 19:59:43	2753
+++ alx-src/branches/alxconf-060/ChangeLog	2011/08/11 20:00:29	2754
@@ -1,5 +1,35 @@
+2011-08-11  Niels Rogalla <niro@magellan-linux.de>
+
+	* [r2752] VERSION:
+	  -version 0.6.0_rc12
+	* [r2751] Makefile:
+	  -added rudimentary plugin support
+	* [r2750] conf/config.rc:
+	  -fixed plugins path
+	* [r2749] plugins[ADD], plugins/firefox[ADD],
+	  plugins/firefox/plugin.sh[ADD], plugins/flashplayer[ADD],
+	  plugins/flashplayer/plugin.sh[ADD], plugins/remserial[ADD],
+	  plugins/remserial/plugin.sh[ADD], plugins/terminal[ADD],
+	  plugins/terminal/plugin.sh[ADD]:
+	  -added rudimentary plugin support
+	* [r2748] init.d/alxsettings:
+	  -added rudimentary plugin support
+	* [r2747] functions/config_plugins.sh[ADD],
+	  functions/config_sessions.sh:
+	  -added rudimentary plugin support
+	* [r2746] conf/config.rc:
+	  -added plugindir location
+
+2011-08-08  Niels Rogalla <niro@magellan-linux.de>
+
+	* [r2718] functions/config_printers.sh:
+	  -enable logging
+	  -always recreate the spooler dirs
+
 2011-07-07  Niels Rogalla <niro@magellan-linux.de>
 
+	* [r2630] ChangeLog:
+	  -updated ChangeLog
 	* [r2629] VERSION:
 	  -version 0.6.0_rc11
 	* [r2624] Makefile: