]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
projects / tmp / jakarta-migration.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c24cc7f fa9c94a)
Merge remote-tracking branch 'upstream/master' into CSPACE-5953
authorAron Roberts <aron@socrates.berkeley.edu>
Wed, 17 Apr 2013 18:50:47 +0000 (11:50 -0700)
committerAron Roberts <aron@socrates.berkeley.edu>
Wed, 17 Apr 2013 18:50:47 +0000 (11:50 -0700)
1  2 
pom.xml patch | diff1 | diff2 | blob | history

diff --cc pom.xml
Simple merge