| commit | fc1c1bff8c62c5f354fec64904b2376ec37b73bd | |
| author | Alex Coles <alex@alexbcoles.com> | |
| Fri, 12 Nov 2010 10:51:04 +0000 (12 11:51 +0100) | ||
| committer | Alex Coles <alex@alexbcoles.com> | |
| Fri, 12 Nov 2010 10:51:04 +0000 (12 11:51 +0100) | ||
| tree | 743a6ff6476739ff03ee90c0153c8634d9fb1391 | treesnapshot (tar.gz zip) |
| parent | 6b2838ada24ba4d93d44cb3a718f62b8019c637c | commitdiff |
| parent | 180f329511e0b694a8ad4281cd21598d57953bd9 | commitdiff |
Merge remote branch 'jonas/master'
Conflicts:
src/org/nbgit/client/CheckoutBuilder.java
Signed-off-by: Alex Coles <alex@alexbcoles.com>
Conflicts:
src/org/nbgit/client/CheckoutBuilder.java
Signed-off-by: Alex Coles <alex@alexbcoles.com>
| src/org/nbgit/client/CheckoutBuilder.java | diff1 | diff2 | blobhistory |