Merge pull request #180 from jmarshallnz/multiple_settings_files
authorMartin Ellis <malard@gmail.com>
Mon, 13 Jun 2011 18:28:25 +0000 (11:28 -0700)
committerMartin Ellis <malard@gmail.com>
Mon, 13 Jun 2011 18:28:25 +0000 (11:28 -0700)
commitae6c5ca7d67e3379cc89c68e11e00be197315b79
treecc8626010ea131082981d94e56a3e1c99c1f5282
parentff081e321a96d0c6ee5c7a3208ec85f8320caad2
parentdad234d4d61aa9a50c55ca2c05f403d45ebccbd1
Merge pull request #180 from jmarshallnz/multiple_settings_files

Multiple settings files (rebased pull req 178/145)
XBMC-ATV2.xcodeproj/project.pbxproj
XBMC-IOS.xcodeproj/project.pbxproj
XBMC.xcodeproj/project.pbxproj
project/VS2010Express/XBMC.vcxproj
project/VS2010Express/XBMC.vcxproj.filters
xbmc/settings/AdvancedSettings.cpp