]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commit
Merge remote-tracking branch 'origin/master' into divVerent/libavcodec
authorRudolf Polzer <divverent@xonotic.org>
Wed, 8 Jun 2011 19:30:03 +0000 (21:30 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 8 Jun 2011 19:30:03 +0000 (21:30 +0200)
commit659c5d94a7bb791d62d5aad42ad3553623bf34ee
tree928592c25e62bae2acf84916eb431139a8ffd169
parent8b4204ac1b4cf026ba003bbcfe6efdf1b1fd8208
parent135f08ba52321984c05e36cdf42ad81420a4d2fd
Merge remote-tracking branch 'origin/master' into divVerent/libavcodec
cap_ogg.c