Stay on safe side, use only one header file.
Other header is located at xbmc/linux/ and seem to be more accurate.
droid: add builtin for executing android apps via applicationmanager
[droid] attach/detach the jvm using thread storage

Threads are automatically attached when issuing a xbmc_jnienv(), and detach
automatically at destruction.

This eliminates manual intervention, and likely will save us from some bugs in
the future. The old code was very difficult to maintain since every function
had to assume that it was not attached and had to detach when finished.

This is the method recommended in the Android docs.
settings: move GUIDialog* and GUIWindow* into their own sub-directories
move AppParamParser.h/cpp from xbmc/settings/ to xbmc/
XMLUtils: add std::string version of GetString()
settings: move UPnP related settings from CSettings to CUPnPSettings
turn CPlayerCoreFactory into a singleton
settings: move logic to load playercorefactory.xml into CPlayerCoreFactory
[win32] update project files
AE: Revisit Device Opening. Try to set periodSize of 100 ms and BufferSize of 800 ms
Always copy overlays from file parser - Fixes stuck hw resources on render
Merge pull request #2363 from FernetMenta/overlay

dvdplayer: make sure subtitle file parsers clone overlays

Since the subtitle parser will keep copies of the overlay structures
even after they have been used, hw gpu resources was never released.
So instead clone them as they leave parser, to have hw resources be
released when not used anymore.
Merge pull request #2258 from Montellese/settings_cleanup

some settings related cleanup
[darwin] sync xcode projects
Merge pull request #2319 from theuni/jni-thread-storage

[droid] attach/detach the jvm using thread storage
Merge pull request #2322 from theuni/android-app-builtin

droid: add builtin for executing android apps via applicationmanager
[keymap] Added two 360 controllers: "Wireless Gamepad F710 (Controller)" and "Afterglow Gamepad for Xbox 360 (Controller)"
[peripherals] fixed CPeripheral::operator ==(const PeripheralScanResult& right)
[cec] make the 'missing libCEC support' warning show up again