]> 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: 6ba59b9 d96c9fa)
NOJIRA: Merging collectionspace master into my local repo, 13Mar2012
authorRick Jaffe <rjaffe@berkeley.edu>
Wed, 14 Mar 2012 00:52:24 +0000 (17:52 -0700)
committerRick Jaffe <rjaffe@berkeley.edu>
Wed, 14 Mar 2012 00:52:24 +0000 (17:52 -0700)
1  2 
.gitignore patch | diff1 | diff2 | blob | history

diff --cc .gitignore
index 2f7896d1d1365eafb0da03d9fe456fac81408487,2c6c748fac724a1836805e8e81fe27c251115173..555af5cbb84b50aea7b45a8a50d6c52c61ae3d76
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--target/
+ *tenant-bindings.merged.xml