Merge remote branch 'origin/master' into mirceakitsune/event_chasecam
authorSamual <samual@xonotic.org>
Fri, 29 Apr 2011 05:35:24 +0000 (01:35 -0400)
committerSamual <samual@xonotic.org>
Fri, 29 Apr 2011 05:35:24 +0000 (01:35 -0400)
commitbd9b670cca7d94ed61720b5d5231bef96f00ef52
tree3044bcf4f88c8a914bf96caf2f329c8eba5ecedb
parent89854d0bdb550cb23d0603adfc790cb0908c0113
parent9c353fa60e05ae62e7092a5c0327c965e422ce3f
Merge remote branch 'origin/master' into mirceakitsune/event_chasecam
defaultXonotic.cfg
qcsrc/client/Main.qc