]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/universal_reload_system
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 17 Feb 2011 14:32:47 +0000 (16:32 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 17 Feb 2011 14:32:47 +0000 (16:32 +0200)
commitbc91f7dc48927953480bdc9622973c7de075fb5f
treecdd189ae28cc27c34ec237804c7e5422eb545682
parentcc7f2857061649324097221e0946b42e130a03f7
parenta264c5e229926ed99be77f49ed5c6b4a9e256ce0
Merge branch 'master' into mirceakitsune/universal_reload_system

Conflicts:
qcsrc/common/constants.qh
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc