]> git.rm.cloudns.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bdc0af8 78b615f)
Merge branch 'master' into ast_iterator
authorDale Weiler <killfieldengine@gmail.com>
Sun, 1 Dec 2013 14:56:41 +0000 (09:56 -0500)
committerDale Weiler <killfieldengine@gmail.com>
Sun, 1 Dec 2013 14:56:41 +0000 (09:56 -0500)
1  2 
util.c patch | diff1 | diff2 | blob | history

diff --cc util.c
Simple merge