summaryrefslogtreecommitdiff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>2013-08-06 10:06:31 +0200
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>2013-08-06 10:06:31 +0200
commit21e17eaa73e387f0713f9b96d92ac043e89c1697 (patch)
treeb64fce6cca62b6d5402ddfb1008af6662753ad08 /COPYRIGHT
parent6735b9727f9c68e0a935fe77d331cf60145b9217 (diff)
parent8e89cad271a8c021e05abda2b0a72d4ef2aac0a4 (diff)
downloadswig-21e17eaa73e387f0713f9b96d92ac043e89c1697.tar.gz
Merge remote-tracking branch 'origin/master' into gsoc2012-scilab
Conflicts: Examples/Makefile.in
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT2
1 files changed, 1 insertions, 1 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index e86a994fa..d0954a3eb 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -66,7 +66,7 @@ Past contributors include:
James Michael DuPont, Clark McGrew, Dustin Mitchell, Ian Cooke, Catalin Dumitrescu, Baran
Kovuk, Oleg Tolmatcev, Tal Shalif, Lluis Padro, Chris Seatory, Igor Bely, Robin Dunn,
Edward Zimmermann, David Ascher, Dominique Dumont, Pier Giorgio Esposito, Hasan Baran Kovuk,
- Klaus Wiederänders
+ Klaus Wiederänders, Richard Beare, Hans Oesterholt.
(See CHANGES and CHANGES.current and the bug tracker for a more complete list).
Past students: