Context Navigation

← Previous Change
Next Change →

Changeset 12878 for issm/branches/trunk-jpl-damage/externalpackages/python

Timestamp:

08/02/12 17:13:12 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 12877

Location:

issm/branches/trunk-jpl-damage

Files:

: 4 deleted
: 3 edited
: 7 copied

. (modified) (1 prop)
externalpackages (modified) (1 prop)
externalpackages/python (modified) (1 prop)
externalpackages/python/install-2.7.2-linux64.sh (copied) (copied from issm/trunk-jpl/externalpackages/python/install-2.7.2-linux64.sh )
externalpackages/python/install-2.7.2-macosx-lion.sh (copied) (copied from issm/trunk-jpl/externalpackages/python/install-2.7.2-macosx-lion.sh )
externalpackages/python/install-2.7.2-macosx-snowleopard.sh (copied) (copied from issm/trunk-jpl/externalpackages/python/install-2.7.2-macosx-snowleopard.sh )
externalpackages/python/install-3.2.2-linux64.sh (copied) (copied from issm/trunk-jpl/externalpackages/python/install-3.2.2-linux64.sh )
externalpackages/python/install-3.2.2-macosx-lion.sh (copied) (copied from issm/trunk-jpl/externalpackages/python/install-3.2.2-macosx-lion.sh )
externalpackages/python/install-3.2.2-macosx-snowleopard.sh (copied) (copied from issm/trunk-jpl/externalpackages/python/install-3.2.2-macosx-snowleopard.sh )
externalpackages/python/install-linux64-astrid.sh (deleted)
externalpackages/python/install-macosx-lion.sh (deleted)
externalpackages/python/install-macosx-snowleopard.sh (deleted)
externalpackages/python/patch (deleted)
externalpackages/python/patches (copied) (copied from issm/trunk-jpl/externalpackages/python/patches )

issm/branches/trunk-jpl-damage

Property svn:mergeinfo changed

/issm/trunk	merged: 12059,12283-12284,12293-12297,12299-12301,12332,12337,12346-12349,12358-12359,12362,12385,12388,12614,12628,12630,12640-12641,12643,12659,12709
/issm/trunk-jpl	merged: 12281-12282,12287-12292,12298,12302-12324,12326-12328,12333-12336,12338-12345,12350-12357,12360-12361,12363-12384,12386-12387,12389-12562,12564-12597,12599-12613,12615-12627,12629,12631-12639,12642,12644-12658,12660-12677,12682-12705,12710-12871,12873-12877

issm/branches/trunk-jpl-damage/externalpackages

Property svn:ignore

old	new
1	1	MITgcm
2	2	OpenAD
	3	ivins

issm/branches/trunk-jpl-damage/externalpackages/python

Property svn:ignore

old	new
	1	install-*
1	2	install
	3	install-python*
2	4	src
3	5	*.tgz

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: