summaryrefslogtreecommitdiff
path: root/COPYRIGHT
Commit message (Expand)AuthorAgeFilesLines
* Update the COPYRIGHT fileZackery Spytz2019-02-231-1/+2
* Another merge with master.Vadim Zeitlin2015-02-161-50/+55
|\
| * Merge branch 'master' into gsoc2012-scilabSimon Marchetto2014-06-061-51/+53
| |\
| * | add of the Scilab developersSylvestre Ledru2013-09-101-1/+5
| * | Merge remote-tracking branch 'origin/master' into gsoc2012-scilabSylvestre Ledru2013-08-061-1/+1
| |\ \
| * \ \ Merge from trunkVincent Couvert2012-02-031-0/+1
| |\ \ \
| * \ \ \ Merged from trunkSylvestre Ledru2011-05-061-3/+5
| |\ \ \ \
| * \ \ \ \ Merge from trunkSylvestre Ledru2010-10-141-3/+41
| |\ \ \ \ \
| * \ \ \ \ \ merge from trunkBaozeng Ding2010-04-301-1/+1
| |\ \ \ \ \ \
| * | | | | | | merge revisions 11872:11876 from trunk to gsoc2009-sploving branch - license ...William S Fulton2010-03-061-0/+64
| / / / / / /
* | | | | | | Merge with the master again.Vadim Zeitlin2014-05-071-0/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Restore missing copyright info in javascript branchWilliam S Fulton2014-04-251-1/+1
| * | | | | | Conflicts:Oliver Buchtala2013-09-271-1/+3
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Merge branch 'devel' of https://github.com/Neha03/gsoc2012-javascript into develOliver Buchtala2012-09-081-3/+3
| | * | | | | Correct place of copyright entry.Oliver Buchtala2012-05-111-0/+1
| | * | | | | Add copyright entry for Oliver Buchtala.Oliver Buchtala2012-05-111-0/+1
| | | |_|_|/ | | |/| | |
* | | | | | Merge branch 'master' into doxygenVadim Zeitlin2014-04-301-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Move contributors to COPYRIGHT file.William S Fulton2012-09-071-1/+1
| * | | | | Move contributor names to where they belongWilliam S Fulton2012-06-111-1/+1
| |/ / / /
* | | | | Added myself to the COPYRIGHTDmitry Kabak2012-05-081-0/+1
|/ / / /
* | | | Add support for eLua including options for Lua Tiny RAM (LTR)William S Fulton2011-09-161-0/+1
| |_|/ |/| |
* | | Added myself to the contributors list.David Nadlinger2011-04-101-2/+3
* | | update copyright yearWilliam S Fulton2011-04-031-1/+1
* | | Added myself to the list of contributorsStefan Zager2011-04-031-0/+1
| |/ |/|
* | New major contributorsv2.0.1rel-2.0.1William S Fulton2010-10-041-1/+3
* | mv contributors from website to COPYRIGHT fileWilliam S Fulton2010-06-021-2/+25
* | Tidy up for first 2.0 release. Move release notes summary into new file RELEA...William S Fulton2010-05-291-0/+13
|/
* Fix typo.Olly Betts2010-03-051-1/+1
* SWIG license change - Licenses put in place and bump version to 2.0.0 - Sourc...William S Fulton2010-02-271-0/+63