de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

projects / xonotic / xonotic-data.pk3dir.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9916365 44e7b9d)

author	Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
	Wed, 2 Mar 2011 22:19:06 +0000 (00:19 +0200)
committer	Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
	Wed, 2 Mar 2011 22:19:06 +0000 (00:19 +0200)
commit	f2671ce82866c2468c1fa315101d30f91af2adbb
tree	c3e71e9b932e3baba90a8105a8a081a46b6a2dec	tree \| snapshot
parent	9916365c2cb451fed25823246c19385c1e1eb726	commit \| diff
parent	44e7b9d6058eef0fa6612930ef5d57dd6df1ca77	commit \| diff

Merge branch 'master' into mirceakitsune/universal_reload_system, with some VERY conflicting changes. This is why I have waiting a long time for a branch to get merged in master.

qcsrc/client/Defs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_minelayer.qc	diff1 \|	diff2 \|	blob \| history