]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commit
Merge branch 'master' into divVerent/libavcodec
authorRudolf Polzer <divverent@xonotic.org>
Sun, 5 Jun 2011 18:59:20 +0000 (20:59 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 5 Jun 2011 18:59:20 +0000 (20:59 +0200)
commitb7e59e479271e8133ec13a0c668cacd85f07e3cc
tree28a642d4bbcd59afe0e45bb5a55d7e3fb0bc5002
parente7336299893507ceb8268e9e2e6b4d3b64f659d0
parent06e741c847a22b0510d83629650954cab0834202
Merge branch 'master' into divVerent/libavcodec