]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa7d44e 5d5b9a3)
Merge branch 'cooking'
authorDale Weiler <weilercdale@gmail.com>
Wed, 10 Dec 2014 07:43:42 +0000 (02:43 -0500)
committerDale Weiler <weilercdale@gmail.com>
Wed, 10 Dec 2014 07:43:42 +0000 (02:43 -0500)
Conflicts:
test.c

1  2 
test.c patch | diff1 | diff2 | blob | history

diff --cc test.c
Simple merge