Merge: Linuxalphabranch with linuxbranch. 13061
authortopfs2 <topfs2@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Fri, 16 May 2008 07:48:15 +0000 (07:48 +0000)
committertopfs2 <topfs2@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Fri, 16 May 2008 07:48:15 +0000 (07:48 +0000)
commit7c270380d7fd856937ecd4eae24f733a83b0bbbe
tree0240b1cca50bc6e893a68e2ad7aab7be67f69cbd
parentfa61428ae947589dafbeef2afca880a83ad3174d
Merge: Linuxalphabranch with linuxbranch. 13061

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/alpha2.1a2-candidate@13062 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
XBMC/Makefile.in
XBMC/Makefile.include.in
XBMC/README.linux
XBMC/guilib/GUIFontTTF.cpp
XBMC/tools/Linux/xbmc.sh.in
XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp