Public Git Hosting - nbgit.git/commit

commit	85d23332ea36a8769ee097f38ccabe980c6727d2
author	Mykola Nikishov <mn@mn.com.ua>
	Mon, 28 Jun 2010 19:47:40 +0000 (28 22:47 +0300)
committer	Mykola Nikishov <mn@mn.com.ua>
	Mon, 28 Jun 2010 22:21:17 +0000 (29 01:21 +0300)
tree	05f75c58fe2ee52e68b847d526bcb1901cd47369	tree \| snapshot (tar.gz zip)
parent	de3e1623708fa751a19f211c8685817e72bb92f4	commit \| diff
parent	77424d0b424457e0b3031887ceeabc2f7cbd83f4	commit \| diff

Merge remote branch 'origin/master' into master-move-to-org.eclipse.jgit-0.8.4

Conflicts:
src/org/nbgit/ui/init/InitAction.java
src/org/nbgit/util/GitCommand.java
test/unit/src/org/nbgit/junit/RepositoryTestCase.java

Signed-off-by: Mykola Nikishov <mn@mn.com.ua>

NetBeans Git Module

RSS Atom

nbproject/project.xml	diff1 \|	diff2 \|	blob \| history
src/org/nbgit/Git.java	diff1 \|	diff2 \|	blob \| history
src/org/nbgit/ui/init/InitAction.java	diff1 \|	diff2 \|	blob \| history
src/org/nbgit/util/GitCommand.java	diff1 \|	diff2 \|	blob \| history
src/org/nbgit/util/GitUtils.java	diff1 \|	diff2 \|	blob \| history
test/unit/src/org/nbgit/junit/RepositoryTestCase.java	diff1 \|	diff2 \|	blob \| history