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

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

projects / xonotic / darkplaces.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0183261 d1a7d5d)

author	Akari <hetors.email@gmail.com>
	Tue, 29 Mar 2011 08:57:53 +0000 (11:57 +0300)
committer	Akari <hetors.email@gmail.com>
	Tue, 29 Mar 2011 08:57:53 +0000 (11:57 +0300)
commit	24bc0a92c71a304d72d313ff996bb4987e9ae368
tree	676ceb2d46c3618410d3bf5f53cf601cdfbfd063	tree \| snapshot
parent	01832617268896b9b0097f7d3571a7783c6ef960	commit \| diff
parent	d1a7d5d11e065a2fef1d0d9665cc8920fc42716f	commit \| diff

Merge branch 'master' into akari/irc

Conflicts:
cl_particles.c
cl_video.c
gl_rmain.c
gl_rsurf.c
gl_textures.c
model_brush.c
r_shadow.c
r_shadow.h
r_sprites.c
screen.h
snd_main.c

cl_main.c	diff1 \|	diff2 \|	blob \| history
cl_video.c	diff1 \|	diff2 \|	blob \| history
console.c	diff1 \|	diff2 \|	blob \| history
gl_rmain.c	diff1 \|	diff2 \|	blob \| history
gl_rsurf.c	diff1 \|	diff2 \|	blob \| history
keys.c	diff1 \|	diff2 \|	blob \| history
makefile.inc	diff1 \|	diff2 \|	blob \| history