git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.10-trunk@5239 33e552b5-05e3-0310-8538-816dae2090ed

2 files changed, 25 insertions, 3 deletions

diff --git a/CREDITS b/CREDITS
index 86cb6fbee..e1cadd4a5 100644
--- a/CREDITS
+++ b/CREDITS
@@ -22,7 +22,7 @@ D: Developer
 
 N: Bjoern Buerger
 E: b.buerger@pengutronix.de
-D: Developer
+D: Maintainer
 S: Pengutronix
 S: Hannoversche Strasse 2
 S: 31134 Hildesheim
@@ -44,7 +44,7 @@ D: Developer
 N: Sascha Hauer 
 E: s.hauer@pengutronix.de
 W: http://www.pengutronix.de
-D: Developer
+D: Maintainer
 S: Pengutronix
 S: Hannoversche Strasse 2
 S: 31134 Hildesheim
@@ -83,6 +83,10 @@ N: Oscar Peredo
 E: oscar@exis.cl
 D: Developer
 
+N: Erwin Rol
+E: erwin@erwinrol.com
+D: Developer
+
 N: Ulf Samuelsson
 E: ulf@atmel.com
 D: Developer
@@ -98,7 +102,7 @@ D: Debugger, Head of Unlogical Code Department
 N: Robert Schwebel
 E: r.schwebel@pengutronix.de
 W: http://www.pengutronix.de
-D: Maintainer, Release Manager 
+D: Project Leader, Maintainer, Release Manager 
 S: Pengutronix
 S: Hannoversche Strasse 2
 S: 31134 Hildesheim
diff --git a/ChangeLog b/ChangeLog
index 1d443afa0..63c14eb0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2006-03-24 Robert Schwebel <r.schwebel@pengutronix.de
+
+	* busybox: made vim an alias to vi; patch by Sascha Hauer
+	* toplevel: added real autoconf support and some initial tests
+	  for things already mentioned in the todo list
+	* configdeps: improved configdep generation. Until now if you 
+	  had menuconfig entries and a sub-entry selected another
+	  packet, but the menuconfig itself was deselected, the
+	  configdeps magic incorrectly activated the selected package.
+	  Patch by Marc Kleine-Budde.
+	* xorg: fixed bug in x.org which broke CAN
+	* initng: initial support for initng; patch by Erwin Rol
+	* udhcp: fixed; patch by Erwin Rol
+	* makefiles: re-activated project specific patches, which have
+	  been broken in 0.10 until now. Patch by Sascha Hauer.
+	* udev: update from 0.68 to 0.88. Erwin Rol.
+	* Xaw: fixed dependency; patch by Erwin Rol.
+
 2006-03-21 Robert Schwebel <r.schwebel@pengutronix.de
 
 	* release: released 0.10.1