]> git.aero2k.de Git - tmp/jakarta-migration.git/commit
projects / tmp / jakarta-migration.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 283db02 1c12331)
Merge branch 'cspace-4813' of github.com:collectionspace/services into cspace-4813
authorRichard Millet <remillet@berkeley.edu>
Wed, 2 May 2012 17:24:16 +0000 (10:24 -0700)
committerRichard Millet <remillet@berkeley.edu>
Wed, 2 May 2012 17:24:16 +0000 (10:24 -0700)
commite06f32f49b6a90680ab30a5a55770417d226571d
tree4b12d224d48b3af31cb98906b111e905fa4d7d3etree | snapshot
parent283db02986cf15ca5b71c83cdea4f648d5e49a66commit | diff
parent1c12331e19138183f2f38ff4a3cdf10760b24a73commit | diff
Merge branch 'cspace-4813' of github.com:collectionspace/services into cspace-4813

Conflicts:
services/authority/jaxb/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityItemJAXBSchema.java
services/authority/jaxb/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityItemJAXBSchema.java diff1 | diff2 | blob | history