Merge remote branch 'upstream/master'
-rw-r--r-- 582963 .cproject
-rw-r--r-- 98 .dummy.am
-rw-r--r-- 41861 .gitignore
-rw-r--r-- 2560 .project
-rw-r--r-- 180 CONTRIBUTORS
-rw-r--r-- 15419 LICENSE.GPL
-rw-r--r-- 21575 Makefile.in
-rw-r--r-- 3513 Makefile.include.in
-rw-r--r-- 11717 README.armel
-rw-r--r-- 5829 README.linux
-rw-r--r-- 9987 README.osx
-rw-r--r-- 5363 README.ubuntu
-rw-r--r-- 7096 XBMC.kdevelop
drwxr-xr-x - XBMC.xcodeproj
drwxr-xr-x - addons
-rwxr-xr-x 595 bootstrap
drwxr-xr-x - build-aux
-rw-r--r-- 65211 configure.in
-rw-r--r-- 18313 copying.txt
drwxr-xr-x - docs
drwxr-xr-x - doxygen_resources
-rwxr-xr-x 278 gitrev.sh
drwxr-xr-x - guilib
-rw-r--r-- 4829 keymapping.txt
drwxr-xr-x - language
drwxr-xr-x - lib
drwxr-xr-x - media
drwxr-xr-x - project
drwxr-xr-x - sounds
drwxr-xr-x - system
drwxr-xr-x - tools
drwxr-xr-x - userdata
-rw-r--r-- 65762 xbmc-xrandr.c
drwxr-xr-x - xbmc