]> de.git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 342836c a7957a9)
Merging master and adopting its main.c
authorWolfgang Bumiller <wolfgang.linux@bumiller.com>
Sat, 28 Jul 2012 19:14:03 +0000 (21:14 +0200)
committerWolfgang Bumiller <wolfgang.linux@bumiller.com>
Sat, 28 Jul 2012 19:14:03 +0000 (21:14 +0200)
1  2 
gmqcc.h patch | diff1 | diff2 | blob | history

diff --cc gmqcc.h
Simple merge