merged from trunk

[SVN r47983]
This commit is contained in:
Eric Niebler
2008-08-05 05:39:57 +00:00
parent 65e99a4933
commit df3c9af238
332 changed files with 2372 additions and 2242 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
/*=============================================================================
Copyright (c) 1999-2003 Jaakko Järvi
Copyright (c) 1999-2003 Jaakko Jarvi
Copyright (c) 2001-2006 Joel de Guzman
Copyright (c) 2006 Dan Marsden