From: Wolfgang Bumiller <wolfgang.linux@bumiller.com>
Date: Sat, 28 Jul 2012 19:14:03 +0000 (+0200)
Subject: Merging master and adopting its main.c
X-Git-Tag: 0.1-rc1~366
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e3dc56fc923e5dc8d404e91cc5ef36ef0bfcc9e6;p=xonotic%2Fgmqcc.git

Merging master and adopting its main.c
---

e3dc56fc923e5dc8d404e91cc5ef36ef0bfcc9e6