git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: daa714a 4566767)

author	Mario <zacjardine@y7mail.com>
	Tue, 14 Apr 2015 22:47:48 +0000 (08:47 +1000)
committer	Mario <zacjardine@y7mail.com>
	Tue, 14 Apr 2015 22:47:48 +0000 (08:47 +1000)
commit	9281dfd2d6431363c20f147e53a86480a99ca2df
tree	94266e895d17a91417e2e3e5c49110aa3eb2d8df	tree \| snapshot
parent	daa714adbde9f05c2e523f6bd617b2f81fdc41ba	commit \| diff
parent	4566767f430d7a15f918d80b234f04c71f929b4e	commit \| diff

Merge branch 'master' into Mario/ons_updates

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/view.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history