]> git.sesse.net Git - vlc/commitdiff
Merge branch 'base' into master
authorRémi Denis-Courmont <remi@remlab.net>
Wed, 27 May 2009 15:50:03 +0000 (18:50 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Wed, 27 May 2009 15:50:08 +0000 (18:50 +0300)
1  2 
extras/contrib/src/Makefile
modules/stream_out/rtp.c

Simple merge
Simple merge