]> source.dussan.org Git - jgit.git/commit
Merge branch 'stable-1.2' 38/4838/1
authorMatthias Sohn <matthias.sohn@sap.com>
Fri, 16 Dec 2011 07:49:59 +0000 (08:49 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Fri, 16 Dec 2011 07:50:49 +0000 (08:50 +0100)
commitf1019b9738089650ed24ae24a41e1567f28ea269
tree332f582bff1d0854f8c5f9e5ec8a03dbd3f0e263
parent84c80be1dc45885969e2d0fa0421f709b8706453
parent78ebffd5f4a65a098a2a41b241747c54905be63d
Merge branch 'stable-1.2'

* stable-1.2:
  Add API checking using clirr
  Fix MergeCommandTest to pass if File.executable is not supported
  Fix ResolveMerger not to add paths with FileMode 0

Change-Id: I86e7194a40acd6dfa3d433f1d17c01bdf5bb0d9c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit.ant/pom.xml
org.eclipse.jgit.console/pom.xml
org.eclipse.jgit.http.server/pom.xml
org.eclipse.jgit.storage.dht/pom.xml
org.eclipse.jgit/pom.xml
pom.xml