Merge branch 'stable-0.11'

* stable-0.11:
  JGit 0.11.3
  Fix NullPointer when pulling from a deleted local branch
  smart-http: Fix recognition of gzip encoding
  Fix processing of broken symbolic references in RefDirectory
  CreateBranchCommand: Wrong existence check
  Qualify post 0.11.1 builds

Conflicts:
	org.eclipse.jgit.console/META-INF/MANIFEST.MF
	org.eclipse.jgit.console/pom.xml
	org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
	org.eclipse.jgit.http.server/pom.xml
	org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
	org.eclipse.jgit.http.test/pom.xml
	org.eclipse.jgit.iplog/META-INF/MANIFEST.MF
	org.eclipse.jgit.iplog/pom.xml
	org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
	org.eclipse.jgit.junit.http/pom.xml
	org.eclipse.jgit.junit/META-INF/MANIFEST.MF
	org.eclipse.jgit.junit/pom.xml
	org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
	org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
	org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml
	org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml
	org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml
	org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml
	org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/pom.xml
	org.eclipse.jgit.packaging/pom.xml
	org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
	org.eclipse.jgit.pgm/pom.xml
	org.eclipse.jgit.test/META-INF/MANIFEST.MF
	org.eclipse.jgit.test/pom.xml
	org.eclipse.jgit.ui/META-INF/MANIFEST.MF
	org.eclipse.jgit.ui/pom.xml
	org.eclipse.jgit/META-INF/MANIFEST.MF
	org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
	org.eclipse.jgit/pom.xml
	pom.xml

Change-Id: I08067c028666f194687943a574512f5bc5ca9552

stable-0.12

Shawn O. Pearce 14 years ago

parent

03f78fc3bc 989149736a

commit

bda1e8fab9

Split View

Merge branch 'stable-0.11'

Diff Content Not Available