]> de.git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9edae7f 36d02d0)
Merge branch 'correct'
authorDale Weiler <killfieldengine@gmail.com>
Fri, 4 Jan 2013 11:56:07 +0000 (11:56 +0000)
committerDale Weiler <killfieldengine@gmail.com>
Fri, 4 Jan 2013 11:56:07 +0000 (11:56 +0000)
1  2 
parser.c patch | diff1 | diff2 | blob | history

diff --cc parser.c
Simple merge