changeset 22285:5411ca13b878

merge of '8d0a8e8a3f64465f6fe98c9344417e6f5f60cace' and 'd7ac6b99ef7882ae0af3758b0267dc2a47020712'
author Jeffrey Connelly <jaconnel@calpoly.edu>
date Mon, 11 Feb 2008 00:50:42 +0000
parents 9559469acd62 (diff) 2222a596340f (current diff)
children 9cce91512be1 36036b9489fe 5aabf4e24188 ed6de6a3604f
files
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/COPYRIGHT	Sun Feb 10 09:45:37 2008 +0000
+++ b/COPYRIGHT	Mon Feb 11 00:50:42 2008 +0000
@@ -255,6 +255,7 @@
 David Mohr
 Andrew Molloy
 Michael Monreal
+Marco Monteiro
 Benjamin Moody
 John Moody
 Tim Mooney
@@ -274,6 +275,7 @@
 Ruediger Oertel
 Gudmundur Bjarni Olafsson
 Bartosz Oler
+Oliver
 Stefan Ott
 Shawn Outman
 Nathan Owens (pianocomp81)