diff options
| author | Lars Op den Kamp <lars@opdenkamp.eu> | 2011-01-04 21:31:59 +0100 |
|---|---|---|
| committer | Lars Op den Kamp <lars@opdenkamp.eu> | 2011-01-04 21:31:59 +0100 |
| commit | 04a05873b98631fb83df9ea68d64cf1299d62516 (patch) | |
| tree | 34f9a1762088a0ccba79f991ea849cde12fb7d5c /.gitignore | |
| parent | ed6aec9ac9e03ed35d3b02b9a00e0bec61d84d6c (diff) | |
| parent | caf2756dc75bc2209f1873df962761165e056cdf (diff) | |
Merge remote branch 'upstream/master'
Fixed conflicts:
addons/skin.confluence/720p/DialogFullScreenInfo.xml
addons/skin.confluence/720p/Home.xml
addons/skin.confluence/720p/PlayerControls.xml
addons/skin.confluence/720p/Settings.xml
addons/skin.confluence/720p/SettingsSystemInfo.xml
addons/skin.confluence/720p/VideoFullScreen.xml
addons/skin.confluence/720p/VideoOSD.xml
addons/skin.confluence/720p/custom_SkinSetting_1111.xml
addons/skin.confluence/720p/defaults.xml
addons/skin.confluence/720p/includes.xml
addons/skin.confluence/language/English/strings.xml
language/Dutch/strings.xml
project/VS2008Express/XBMC for Windows.sln
project/VS2008Express/XBMC.vcproj
project/VS2008Express/guilib.vcproj
xbmc/addons/AddonDll.h
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions