vlc/vlc-2.0 | branch: master | Rafaël Carré <[email protected]> | Sun Feb 5
12:46:04 2012 -0500| [ad9fe196a76ef9e7068139182c535d329f198025] | committer:
Rafaël Carré
Mention 2.0.0 instead of 1.2.0
(cherry picked from commit 90b7695c83dc677de4c29242341d5e0cf1c238b4)
Conflicts:
po/te.po
po/vlc.pot
Signed-off-by: Rafaël Carré <[email protected]>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=ad9fe196a76ef9e7068139182c535d329f198025
---
doc/libvlc/vlc-thumb.c | 2 +-
include/vlc/libvlc_media_player.h | 16 +++---
modules/access/dtv/access.c | 6 +-
modules/access/udp.c | 2 +-
modules/access/v4l2/video.c | 4 +-
modules/gui/macosx/macosx.m | 6 +-
modules/gui/qt4/qt4.cpp | 6 +-
modules/services_discovery/sap.c | 4 +-
modules/video_output/xcb/x11.c | 2 +-
modules/video_output/xcb/xvideo.c | 2 +-
po/et.po | 2 +-
po/eu.po | 2 +-
src/libvlc-module.c | 96 ++++++++++++++++++------------------
13 files changed, 75 insertions(+), 75 deletions(-)
Diff:
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commitdiff;h=ad9fe196a76ef9e7068139182c535d329f198025
_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits
