I hate xcuserstate
xcuserstate
merge mediaObject
ignore more files
xcuserdata....
Merge branch 'master' of https://github.com/camb416/Poison_2013
Pull upstream changes in
Merge branch 'master' of https://github.com/camb416/Poison_2013
Add Bookloader files for testing
add Save xml functionality
add xml load and save functionality
add proj file for merge
merge language and xml branches
merge with current
XML settings intermediary commit for troubleshooting
settings
added full screen toggle in debugUI
add load (default and custom) XML functionality to debug UI
Merge branch 'XMLSettings' of https://github.com/camb416/Poison_2013 into XMLSettings
merged from upstream
Add functionality to load videos from xml and autoplay. Needs work on positioning, etc