]> git.aero2k.de Git - tmp/jakarta-migration.git/commit
projects / tmp / jakarta-migration.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: edc5c51 96cebac)
Merge branch 'CSPACE-6329' into CSPACE-6329-A. This merges in Aron's CSPACE-6329...
authorAron Roberts <aron@socrates.berkeley.edu>
Thu, 6 Mar 2014 23:37:00 +0000 (15:37 -0800)
committerAron Roberts <aron@socrates.berkeley.edu>
Thu, 6 Mar 2014 23:37:00 +0000 (15:37 -0800)
commit6b5f2545f922f9e9116e87c08d56ad3262df30a2
tree45dfe8099bd45cff314bd13f2515e8bb65e0a746tree | snapshot
parentedc5c510d6839c33594677bff89f5ce41e8f66c8commit | diff
parent96cebacd35fde7bb42908b99167ea29459fb2638commit | diff
Merge branch 'CSPACE-6329' into CSPACE-6329-A. This merges in Aron's CSPACE-6329 changes into Richard's CSPACE-6168-REM-A branch.

Conflicts:
3rdparty/nuxeo/build.xml
build.properties
services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
3rdparty/nuxeo/build.xml diff1 | diff2 | blob | history
services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java diff1 | diff2 | blob | history