Merge branch 'master' into divVerent/ballistic2
authorRudolf Polzer <divverent@xonotic.org>
Wed, 1 Jan 2014 09:49:30 +0000 (10:49 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 1 Jan 2014 09:49:30 +0000 (10:49 +0100)
commit267b14d636d605b1e52aa5482dff6f6827b5db94
tree88708e4b78c4f4785bbf3cc47e5d0b3e9f3ac9b1
parentd91906e1bb6225cd68269812a6d2b4314e23fcdb
parent53892b37b4ba4903ef7bdd8f8429158460f3cc53
Merge branch 'master' into divVerent/ballistic2
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/server/miscfunctions.qc