Public Git Hosting - git/dscho.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: d1241ac f2cce4c)

commit	d5ef2b3020f8c5874c416ea7aa338a8631c3bd73
author	Johannes Schindelin <johannes.schindelin@gmx.de>
	Thu, 28 Jan 2010 03:13:14 +0000 (28 04:13 +0100)
committer	Johannes Schindelin <johannes.schindelin@gmx.de>
	Thu, 28 Jan 2010 03:13:14 +0000 (28 04:13 +0100)
tree	0b4d21d9a1db23fd11861e46b96177159216e12d	tree \| snapshot (tar.gz zip)
parent	d1241ac271c6381a72849dde3a48650bbc897a97	commit \| diff
parent	f2cce4c2bc2119d42d35797663b94d56cea236e1	commit \| diff

Merge remote branch 'mingw/master' into devel

Conflicts:
Makefile
commit.c
compat/mingw.c
config.c
environment.c
http.c

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Documentation/config.txt	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
cache.h	diff1 \|	diff2 \|	blob \| history
compat/mingw.c	diff1 \|	diff2 \|	blob \| history
compat/mingw.h	diff1 \|	diff2 \|	blob \| history
compat/regex/regex.c	diff1 \|	diff2 \|	blob \| history
config.c	diff1 \|	diff2 \|	blob \| history
environment.c	diff1 \|	diff2 \|	blob \| history
git-compat-util.h	diff1 \|	diff2 \|	blob \| history
git-send-email.perl	diff1 \|	diff2 \|	blob \| history
http.c	diff1 \|	diff2 \|	blob \| history

Dscho's miscellaneous git branches