]> git.tokkee.org Git - git.git/commitdiff
[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7141b3b 390cb0c)
Merge branch 'master'
authorJunio C Hamano <junkio@cox.net>
Tue, 8 Nov 2005 02:23:45 +0000 (18:23 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 8 Nov 2005 02:23:45 +0000 (18:23 -0800)
1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
Git - the stupid content tracker