diff options
| author | Oliver Buchtala <oliver.buchtala@googlemail.com> | 2012-09-08 00:56:48 +0000 |
|---|---|---|
| committer | Oliver Buchtala <oliver.buchtala@googlemail.com> | 2012-09-08 00:56:48 +0000 |
| commit | 050219d998c0a518b54366c6c543fa926e601e5b (patch) | |
| tree | a199f8711e72e8120ce62fbb02a30c07c87128b5 /COPYRIGHT | |
| parent | 360ef44e09e9072702215c46306731ccbbbc1d03 (diff) | |
| download | swig-050219d998c0a518b54366c6c543fa926e601e5b.tar.gz | |
Merge branch 'devel' of https://github.com/Neha03/gsoc2012-javascript into devel
Conflicts:
.project
COPYRIGHT
Doc/Manual/style.css
Examples/Makefile.in
Examples/test-suite/common.mk
Lib/typemaps/strings.swg
Makefile.in
Source/DOH/fio.c
Source/Makefile.am
Source/Modules/emit.cxx
Source/Modules/javascript.cxx
configure.in
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/oliverb-javascript-v8@13764 626c5289-ae23-0410-ae9c-e8d60b6d4f22
Diffstat (limited to 'COPYRIGHT')
| -rw-r--r-- | COPYRIGHT | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -15,8 +15,9 @@ Active SWIG Developers: Olly Betts (olly@survex.com) (PHP) Joseph Wang (joequant@gmail.com) (R) Xavier Delacour (xavier.delacour@gmail.com) (Octave) - David Nadlinger (code@klickverbot.at) (D) - Oliver Buchtala (Javascript) + David Nadlinger (code@klickverbot.at) + Oliver Buchtala (oliver.buchtala@gmail.com) (Javascript) + Neha Narang (narangneha03@gmail.com) (Javascript) Past SWIG developers and major contributors include: Dave Beazley (dave-swig@dabeaz.com) (SWIG core, Python, Tcl, Perl) @@ -61,7 +62,6 @@ Past SWIG developers and major contributors include: Ian Lance Taylor (Go) Vadim Zeitlin (PCRE) Stefan Zager (szager@gmail.com) (Python) - Oliver Buchtala (Javascript) Past contributors include: James Michael DuPont, Clark McGrew, Dustin Mitchell, Ian Cooke, Catalin Dumitrescu, Baran |