| commit | dc8b641f1a42cec7c77d8ba5bf21cad03479f652 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Tue, 7 Apr 2009 15:39:50 +0000 (7 17:39 +0200) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Tue, 7 Apr 2009 15:39:50 +0000 (7 17:39 +0200) | ||
| tree | 7849b736ee9b121cc65b7967d652a5717616f33c | treesnapshot (tar.gz zip) |
| parent | f7512386097c4f20e3c147e5de8888e49e4835c5 | commitdiff |
| parent | 1e52e22d9e874e135f0f724ef87d952afdfc5316 | commitdiff |
Merge commit 'j6t/master' into devel
Conflicts:
Makefile
compat/mingw.c
compat/win32mmap.c
t/t1301-shared-repo.sh
t/t4020-diff-external.sh
t/t4129-apply-samemode.sh
t/t7005-editor.sh
t/test-lib.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Conflicts:
Makefile
compat/mingw.c
compat/win32mmap.c
t/t1301-shared-repo.sh
t/t4020-diff-external.sh
t/t4129-apply-samemode.sh
t/t7005-editor.sh
t/test-lib.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>