Merged changes from gamelibrary branch into a more up-to-date (post the directx merge...
authormoby-uk <moby-uk@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sat, 5 Sep 2009 18:21:01 +0000 (18:21 +0000)
committermoby-uk <moby-uk@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sat, 5 Sep 2009 18:21:01 +0000 (18:21 +0000)
commit2d32b62c246558e41c0dbce2abe8a4ec94b0f3b8
tree3498afb519749a9143807bcc909edc92f9c256ea
parentfb5e7776c0fe985e5b9f117a8e3af27bc0c85bfd
Merged changes from gamelibrary branch into a more up-to-date (post the directx merge) branch.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/gamelibrary2@22764 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
44 files changed:
XBMC.xcodeproj/project.pbxproj
guilib/Key.h
language/English/strings.xml
project/VS2008Express/XBMC.vcproj
skin/PM3.HD/720p/MyPrograms.xml
skin/PM3.HD/720p/MyProgramsNav.xml [new file with mode: 0644]
skin/Project Mayhem III/PAL/DialogProgramInfo.xml [new file with mode: 0644]
skin/Project Mayhem III/PAL/MyPrograms.xml
skin/Project Mayhem III/PAL/MyProgramsNav.xml [new file with mode: 0644]
xbmc/Application.cpp
xbmc/ButtonTranslator.cpp
xbmc/FileItem.h
xbmc/GUIDialogContentSettings.cpp
xbmc/GUIDialogContentSettings.h
xbmc/GUIDialogMediaSource.cpp
xbmc/GUISettings.cpp
xbmc/GUIViewState.cpp
xbmc/GUIViewStatePrograms.cpp
xbmc/GUIViewStatePrograms.h
xbmc/GUIWindowProgramNav.cpp [new file with mode: 0644]
xbmc/GUIWindowProgramNav.h [new file with mode: 0644]
xbmc/GUIWindowPrograms.cpp
xbmc/GUIWindowPrograms.h
xbmc/GUIWindowSettingsCategory.cpp
xbmc/Makefile
xbmc/NfoFile.cpp
xbmc/ProgramDatabase.cpp
xbmc/ProgramDatabase.h
xbmc/ProgramInfoScanner.cpp [new file with mode: 0644]
xbmc/ProgramInfoScanner.h [new file with mode: 0644]
xbmc/ProgramInfoTag.cpp [new file with mode: 0644]
xbmc/ProgramInfoTag.h [new file with mode: 0644]
xbmc/Settings.cpp
xbmc/Settings.h
xbmc/Util.cpp
xbmc/Util.h
xbmc/utils/Makefile
xbmc/utils/ProgramInfo.cpp [new file with mode: 0644]
xbmc/utils/ProgramInfo.h [new file with mode: 0644]
xbmc/utils/ProgramInfoScraper.cpp [new file with mode: 0644]
xbmc/utils/ProgramInfoScraper.h [new file with mode: 0644]
xbmc/utils/ScraperParser.cpp
xbmc/win32/WIN32Util.cpp
xbmc/win32/WIN32Util.h