-
Notifications
You must be signed in to change notification settings - Fork 149
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update STABLE to match trunk r55605. This is the big merge (but not t…
…he final merge) before tagging the next release. svn:revision:55609 svn:branch:STABLE svn:account:starseeker
- Loading branch information
Showing
4,841 changed files
with
345,415 additions
and
388,779 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,3 +32,8 @@ | |
/Makefile.in | ||
/mged | ||
|
||
/Makefile | ||
/Makefile.in | ||
/scl_config.h | ||
/scl_config.h.in | ||
/stamp-h1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -60,7 +60,7 @@ Open Source Point of Contact | |
Morrison, Christopher Sean <[email protected]> | ||
|
||
U.S. Army Research Laboratory Point of Contact | ||
Davisson, Edwin O. <[email protected]> | ||
Yapp, Cliff | ||
|
||
|
||
DEVELOPERS | ||
|
@@ -298,6 +298,24 @@ Mgebrova, Karen | |
2012 February | ||
Open Source | ||
|
||
Elnazli, Cezar | ||
nicknames caen23 | ||
2012 November | ||
Open Source (GCI) | ||
|
||
Burroughs, Jacob | ||
nicknames maths22 | ||
2012 November | ||
Open Source (GCI) | ||
|
||
Stoyanova, Stefi | ||
2012 November | ||
Open Source (GCI) | ||
|
||
Perez, Alex | ||
2012 November | ||
Open Source (GCI) | ||
|
||
|
||
CODE CONTRIBUTIONS | ||
------------------ | ||
|
@@ -537,7 +555,7 @@ nicknames abhi2011 | |
2011 July | ||
Open Source (SOCIS) | ||
|
||
Moore, Jr., Carl G. | ||
Moore, Jr., Carl G. | ||
nicknames cmoore | ||
2011 October | ||
U.S. Army Research Laboratory | ||
|
@@ -577,6 +595,64 @@ nicknames Al_Da_Best, aldabest | |
2012 May | ||
Open Source (GSoC) | ||
|
||
Laijiren | ||
nicknames plussai2008 | ||
2012 June | ||
Open Source (GSoC) | ||
|
||
Niculaescu, Oana | ||
nicknames elf11 | ||
2012 August | ||
Open Source (SOCIS) | ||
|
||
Ungureanu, Silviu | ||
nicknames Silvrous | ||
2012 November | ||
Open Source (GCI) | ||
|
||
Kashyap, Akshay | ||
nicknames Skriptkid | ||
2012 November | ||
Open Source (GCI) | ||
|
||
Borisov, Dimitar | ||
2012 November | ||
Open Source (GCI) | ||
|
||
Pal, Ambar | ||
2012 November | ||
Open Source (GCI) | ||
|
||
Elnazli, Cezar | ||
nicknames caen23 | ||
2012 November | ||
Open Source (GCI) | ||
|
||
nicknames Reikaze | ||
2012 December | ||
Open Source (GCI) | ||
|
||
Phillips, Lachlan | ||
2012 December | ||
Open Source (GCI) | ||
|
||
Calle, Adrián Arroyo | ||
2012 December | ||
Open Source (GCI) | ||
|
||
Keesing, Aaron | ||
2012 December | ||
Open Source (GCI) | ||
|
||
Govindjee, Arjun | ||
2012 December | ||
Open Source (GCI) | ||
|
||
Nagy, Csaba | ||
nicknames ncsaba | ||
2013 April | ||
Open Source | ||
|
||
|
||
SPECIAL THANKS | ||
-------------- | ||
|
@@ -601,12 +677,12 @@ Kuehl, Gary | |
U.S. Army Ballistic Research Laboratory | ||
|
||
Martin, Glenn E. | ||
Northrup Research and Technology Center | ||
Northrop Research and Technology Center | ||
|
||
Willson, Stephen Hunter | ||
Northrup Research and Technology Center | ||
Northrop Research and Technology Center | ||
|
||
Merrit, Don | ||
Merritt, Don | ||
nicknames merritt | ||
1988 September | ||
U.S. Army Ballistic Research Laboratory | ||
|
@@ -827,6 +903,24 @@ nicknames cmpitts | |
2011 August | ||
Open Source | ||
|
||
Wang, Max | ||
nicknames wmaanxg | ||
2012 October | ||
Open Source | ||
|
||
Ha, An Tuan | ||
2012 December | ||
Open Source (GCI) | ||
|
||
Singh, Gauravjeet | ||
2012 December | ||
Open Source (GCI) | ||
|
||
Saxena, Amit | ||
nicknames amit.daBeast | ||
2012 December | ||
Open Source (GCI) | ||
|
||
|
||
CORPORATE AND ORGANIZATION SUPPORT | ||
---------------------------------- | ||
|
@@ -844,8 +938,8 @@ Night Vision & Electronic Sensors Directorate | |
|
||
U.S. Naval Academy | ||
|
||
Northrup, Inc. | ||
Norhtrup Research and Technology Center | ||
Northrop Corporation | ||
Northrop Research and Technology Center | ||
|
||
SGI | ||
formerly named Silicon Graphics, Inc. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.