]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
projects / xonotic / gmqcc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a5e5c0 42168fd)
Merge branch 'master' into blub/bc3
authorWolfgang Bumiller <wolfgang.linux@bumiller.com>
Fri, 27 Jul 2012 13:27:41 +0000 (15:27 +0200)
committerWolfgang Bumiller <wolfgang.linux@bumiller.com>
Fri, 27 Jul 2012 13:27:41 +0000 (15:27 +0200)
1  2 
ast.h patch | diff1 | diff2 | blob | history

diff --cc ast.h
Simple merge