Merge commit 'origin/master' into divVerent/tag_seeker
authorRudolf Polzer <divverent@alientrap.org>
Sat, 8 May 2010 18:43:45 +0000 (20:43 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 8 May 2010 18:43:45 +0000 (20:43 +0200)
commit58b26c0a303456441dbb82e608213d2f86d695d8
tree88997036770be052de312ee95ca00f078c2ba2e9
parentff656ea086d14c75baf49e2365f12a0cd8592715
parent70c8c5954262fc62dee11d9f5f463b9996f544d7
Merge commit 'origin/master' into divVerent/tag_seeker
balance.cfg
balance25.cfg
balanceSamual.cfg
balanceXPM.cfg
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/damage.qc
qcsrc/client/projectile.qc
qcsrc/common/constants.qh
qcsrc/server/t_items.qc