Context Navigation

← Previous Change
Next Change →

Changeset 18301 for issm/trunk/src/wrappers/Makefile.am

Timestamp:

07/30/14 14:22:43 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 18299

Location:

Files:

: 3 edited

. (modified) (1 prop)
src (modified) (1 prop)
src/wrappers/Makefile.am (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

issm/trunk

Property svn:mergeinfo changed

/issm/trunk-jpl

merged: 17990-17995,17999-18003,18005-18012,18024-18037,18039,18041-18045,18049-18050,18052-18065,18067-18079,18082-18085,18087,18089-18097,18099-18143,18147-18153,18157-18177,18179-18214,18216-18230,18232-18291,18293-18295,18297-18298

issm/trunk/src

Property svn:mergeinfo changed

/issm/trunk-jpl/src

merged: 17990-17995,18000-18001,18003,18005-18012,18025,18027-18037,18039,18041,18043-18045,18052-18064,18067-18068,18070,18073-18079,18087,18089,18093-18094,18096,18099-18105,18107,18109,18111,18115-18116,18118,18122-18128,18130-18132,18134-18143,18147-18153,18157,18161-18163,18166,18169-18171,18173-18175,18179-18180,18182-18188,18190-18197,18207-18213,18216,18218,18222-18225,18227,18232,18235-18237,18239-18246,18250-18259,18262,18265-18266,18277-18286,18290,18293-18294,18298

issm/trunk/src/wrappers/Makefile.am

-              r12032
+              r18301
 SUBDIRS =
+if WRAPPERS
 if MATLAB
 SUBDIRS += matlab
 …
 SUBDIRS += python
 endif
+endif

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

Download in other formats: