Merge remote branch 'origin/trunk' into fhs
authorceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Mon, 10 May 2010 07:12:21 +0000 (07:12 +0000)
committerceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Mon, 10 May 2010 07:12:21 +0000 (07:12 +0000)
commite889406765973146fb234ed20df11212ecb60f1a
tree217c6619143bf4f65f957a74d7a462bda69a76e9
parent17ec7c5e23b81308b6ae83ba6e4dacb187973347
Merge remote branch 'origin/trunk' into fhs

Conflicts:
tools/EventClients/Makefile
tools/Linux/packaging/debian/changelog
tools/Linux/packaging/debian/rules
tools/Linux/packaging/debian/xbmc-get-orig-source

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/fhs@29980 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
13 files changed:
XBMC.xcodeproj/project.pbxproj
addons/skin.pm3-hd/720p/DialogFullScreenInfo.xml
addons/skin.pm3-hd/720p/MyMusicPlaylistEditor.xml
addons/skin.pm3-hd/media/icon_appearence.png
xbmc/RenderSystemDX.cpp
xbmc/cores/VideoRenderers/LinuxRenderer.cpp
xbmc/cores/VideoRenderers/LinuxRenderer.h
xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
xbmc/cores/VideoRenderers/LinuxRendererGL.h
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.h
xbmc/lib/libapetag/config.h.in~ [deleted file]
xbmc/osx/Makefile.in