]> git.xonotic.org Git - xonotic/gmqcc.git/commit
Merge branch 'master' into blub/parser
authorWolfgang (Blub) Bumiller <blub@speed.at>
Tue, 14 Aug 2012 08:42:34 +0000 (10:42 +0200)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Tue, 14 Aug 2012 08:42:34 +0000 (10:42 +0200)
commit82d9651529c992e658f21c04c781383d6a0d8f38
tree7f2eeeb408f391839405397d71b877a7b10f8cc7
parent69d9afbc695102d7cd81210327626ea0d19d6b10
parentcfdf915b25352648748095685e00af917549639d
Merge branch 'master' into blub/parser