]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b4204a 135f08b)
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)
1  2 
cap_ogg.c patch | diff1 | diff2 | blob | history

diff --cc cap_ogg.c
Simple merge