]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Thu, 27 Sep 2012 04:43:58 +0000 (00:43 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 27 Sep 2012 04:43:58 +0000 (00:43 -0400)
commit0b401fc152bb8ea3accab7052bd615fead2fb4cc
treeb63604556c75dfcee053cd1382defd4d385722e8
parentd995483c1316a4f9aa7dac041447167de75b9735
parent1f36716696fa1230d5b3f3a65f1cdf3ee715658a
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

Conflicts:
qcsrc/client/Main.qc
qcsrc/server/g_world.qc
qcsrc/client/Main.qc
qcsrc/common/constants.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc