]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-3.7' 87/42587/1
authorMatthias Sohn <matthias.sohn@sap.com>
Tue, 24 Feb 2015 22:44:56 +0000 (23:44 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Tue, 24 Feb 2015 22:45:19 +0000 (23:45 +0100)
* stable-3.7:
  Add log4j and slf4j-log4j bridge to jgit feature
  Use slf4j to log instead of printing to System.err
  Use Target Platform Definition DSL to generate target platforms

Change-Id: Ic8779868150c910fa55fd20348e35723e6add0f1

1  2 
org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
org.eclipse.jgit/META-INF/MANIFEST.MF
org.eclipse.jgit/pom.xml
pom.xml

Simple merge
Simple merge
diff --cc pom.xml
Simple merge