git.rm.cloudns.org Git - xonotic/darkplaces.git/commit

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

projects / xonotic / darkplaces.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ad89583 75baaab)

author	Mario <zacjardine@y7mail.com>
	Sun, 16 Nov 2014 13:14:49 +0000 (00:14 +1100)
committer	Mario <zacjardine@y7mail.com>
	Sun, 16 Nov 2014 13:14:49 +0000 (00:14 +1100)
commit	60415c47de8b907b3eb9959cce58fcbb14db5d93
tree	fb331116d1aedd66f26d4dc3c98303c98a61c7ef	tree \| snapshot
parent	ad895833c01e2d77e4fa5fcc88a258323f123de8	commit \| diff
parent	75baaab0958be44cdc1b521045cc72ffac7e6c5a	commit \| diff

Merge branch 'div0-stable' into nitroxis/irc

Conflicts:
dpdefs/menudefs.qc
prvm_cmds.c
prvm_cmds.h

.DS_Store	\|	\|	blob
console.c	diff1 \|	diff2 \|	blob \| history
dpdefs/menudefs.qc	diff1 \|	diff2 \|	blob \| history
makefile.inc	diff1 \|	diff2 \|	blob \| history
prvm_cmds.c	diff1 \|	diff2 \|	blob \| history
prvm_cmds.h	diff1 \|	diff2 \|	blob \| history
prvm_offsets.h	diff1 \|	diff2 \|	blob \| history
svvm_cmds.c	diff1 \|	diff2 \|	blob \| history