]> source.dussan.org Git - jgit.git/commit
Merge branch 'stable-0.11' 05/2605/1
authorShawn O. Pearce <spearce@spearce.org>
Sat, 26 Feb 2011 01:24:55 +0000 (17:24 -0800)
committerShawn O. Pearce <spearce@spearce.org>
Sat, 26 Feb 2011 01:24:55 +0000 (17:24 -0800)
commitbda1e8fab901706d1b08ecb3915b35b02ffdd5ab
treec5c4fc5d2516f4fb208c72165e3c8389e4b1580a
parent03f78fc3bc0c60e589c98d56830ffa5ba1eacd7e
parent989149736ad1cd09c15e143aa598028b9f9b6502
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