Commit graph

24 commits

Author SHA1 Message Date
Simon Marchetto
07b06a4089 Merge branch 'master' into gsoc2012-scilab
Conflicts:
	.gitignore
	.travis.yml
	COPYRIGHT
	Examples/Makefile.in
	Examples/test-suite/constructor_copy.i
	Makefile.in
	configure.ac
2014-06-06 16:33:16 +02:00
William S Fulton
f68e47af3e Restore missing copyright info in javascript branch 2014-04-25 07:57:32 +01:00
Oliver Buchtala
6dcbbf07db Conflicts:
.gitignore
	.project
	.travis.yml
	Examples/Makefile.in
	Examples/test-suite/director_nspace.i
2013-09-27 02:29:02 +02:00
Sylvestre Ledru
0314bc99fd add of the Scilab developers 2013-09-10 19:48:45 +02:00
Sylvestre Ledru
21e17eaa73 Merge remote-tracking branch 'origin/master' into gsoc2012-scilab
Conflicts:
	Examples/Makefile.in
2013-08-06 10:06:31 +02:00
Oliver Buchtala
050219d998 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
2012-09-08 00:56:48 +00:00
William S Fulton
d496352805 Move contributors to COPYRIGHT file.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13734 626c5289-ae23-0410-ae9c-e8d60b6d4f22
2012-09-07 06:03:20 +00:00
William S Fulton
e4a3a004ae Move contributor names to where they belong
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13160 626c5289-ae23-0410-ae9c-e8d60b6d4f22
2012-06-11 18:05:56 +00:00
Oliver Buchtala
c86ce942c2 Correct place of copyright entry.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/oliverb-javascript-v8@13070 626c5289-ae23-0410-ae9c-e8d60b6d4f22
2012-05-11 19:20:07 +00:00
Oliver Buchtala
d6060ceced Add copyright entry for Oliver Buchtala.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/oliverb-javascript-v8@13067 626c5289-ae23-0410-ae9c-e8d60b6d4f22
2012-05-11 13:55:16 +00:00
Vincent Couvert
dd3db36b1a Merge from trunk
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2009-sploving@12905 626c5289-ae23-0410-ae9c-e8d60b6d4f22
2012-02-03 14:37:31 +00:00
William S Fulton
91d22324e7 Add support for eLua including options for Lua Tiny RAM (LTR)
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12813 626c5289-ae23-0410-ae9c-e8d60b6d4f22
2011-09-16 22:53:35 +00:00
Sylvestre Ledru
954256979c Merged from trunk
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2009-sploving@12656 626c5289-ae23-0410-ae9c-e8d60b6d4f22
2011-05-06 10:15:45 +00:00
David Nadlinger
23735d5d8f Added myself to the contributors list.
I was a bit unsure about the right position (the second list seems to list "past major contributors"), feel free to shuffle my name around.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12627 626c5289-ae23-0410-ae9c-e8d60b6d4f22
2011-04-10 14:02:08 +00:00
William S Fulton
f28176dc77 update copyright year
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12603 626c5289-ae23-0410-ae9c-e8d60b6d4f22
2011-04-03 19:02:20 +00:00
Stefan Zager
6c25cdde13 Added myself to the list of contributors
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12601 626c5289-ae23-0410-ae9c-e8d60b6d4f22
2011-04-03 18:11:57 +00:00
Sylvestre Ledru
1842244c93 Merge from trunk
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2009-sploving@12270 626c5289-ae23-0410-ae9c-e8d60b6d4f22
2010-10-14 14:15:42 +00:00
William S Fulton
aabd75f3d8 New major contributors
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12256 626c5289-ae23-0410-ae9c-e8d60b6d4f22
2010-10-04 19:30:53 +00:00
William S Fulton
490f3a838b mv contributors from website to COPYRIGHT file
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12084 626c5289-ae23-0410-ae9c-e8d60b6d4f22
2010-06-02 20:00:20 +00:00
William S Fulton
27056fbd9f Tidy up for first 2.0 release. Move release notes summary into new file RELEASENOTES
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12069 626c5289-ae23-0410-ae9c-e8d60b6d4f22
2010-05-29 21:24:08 +00:00
Baozeng Ding
07cb6351f1 merge from trunk
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2009-sploving@12002 626c5289-ae23-0410-ae9c-e8d60b6d4f22
2010-04-30 03:03:24 +00:00
William S Fulton
f2b542d8f4 merge revisions 11872:11876 from trunk to gsoc2009-sploving branch - license changes
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2009-sploving@11906 626c5289-ae23-0410-ae9c-e8d60b6d4f22
2010-03-06 01:19:37 +00:00
Olly Betts
d7695d4f10 Fix typo.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11898 626c5289-ae23-0410-ae9c-e8d60b6d4f22
2010-03-05 03:43:41 +00:00
William S Fulton
283bb830bd SWIG license change - Licenses put in place and bump version to 2.0.0 - Source moves to GPLv3. The Examples and Lib move to a very permissive license, removing the BSD license restrictions as agreed by committers since it was inadvertently introduced.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11873 626c5289-ae23-0410-ae9c-e8d60b6d4f22
2010-02-27 23:04:21 +00:00