summaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2006-03-24 06:56:12 +0000
committerRobert Schwebel <r.schwebel@pengutronix.de>2006-03-24 06:56:12 +0000
commit6579fc9f465b4881daf8cc27325b7ffc010d7b4e (patch)
tree20da848af4f3b199d7b761d3f5cc0ecb99ccfa35 /CREDITS
parentd64d9d3f246b023e4ee403b462dfd54be43e4a78 (diff)
downloadptxdist-6579fc9f465b4881daf8cc27325b7ffc010d7b4e.tar.gz
ptxdist-6579fc9f465b4881daf8cc27325b7ffc010d7b4e.tar.xz
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.10-trunk@5239 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS10
1 files changed, 7 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