Permalink
Browse files

Merge branch 'master' of https://github.com/xbmc/xbmc into insufficie…

…nt-video-buffer
  • Loading branch information...
2 parents 3f148da + 8a2d157 commit fdedf13641acc09a7af983d0fa1f78f72ec2e8ad @zewt committed Sep 29, 2012
Showing 3,880 changed files with 403,898 additions and 86,968 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
View
@@ -7,6 +7,7 @@ testMain
# Eclipse
*.project
*.cproject
+.classpath
# generated files etc
config.cache
@@ -28,6 +29,7 @@ config.log
*.orig
*.bak
*.apk
+*.class
# Windows specific generated files
*.exp
@@ -41,6 +43,7 @@ config.log
*.vcxproj.*.user
*.vcxproj.user
*.obj
+*.idb
*ReSharper*
*.idb
@@ -65,6 +68,11 @@ config.log
.libs/
.deps/
+# Eclipse project files. Not needed as they are generated in two clicks if needed.
+.settings
+.project
+.cproject
+
# /
/.dummy
/.dummy.in
@@ -75,6 +83,7 @@ config.log
/build-aux/config.guess
/build-aux/config.sub
/build-aux/install-sh
+/build-aux/ltmain.sh
/build-aux/missing
/build-aux/ltmain.sh
/autotools
@@ -89,6 +98,7 @@ config.log
/configure
/xbmc/stamp-h1
/xbmc.bin
+/xbmc-test
/xbmc-xrandr
/git_revision.h
/libtool
@@ -113,6 +123,7 @@ config.log
/addons/visualization.waveform/Waveform_win32.vis
/addons/visualization.itunes/iTunes.mvis
/addons/script.module.pil/
+/addons/pvr.*
# /xbmc/android
/xbmc/android/Makefile
@@ -137,6 +148,9 @@ config.log
/xbmc/peripherals/bus/Makefile
/xbmc/peripherals/devices/Makefile
+# /xbmc/main/
+/xbmc/main/Makefile
+
# /lib/
/lib/Makefile
@@ -153,6 +167,17 @@ config.log
/lib/asap/xbmc/xbmc_asap.res
+# /lib/addons/
+/lib/addons/library.xbmc.addon/Makefile
+/lib/addons/library.xbmc.gui/Makefile
+/lib/addons/library.xbmc.pvr/Makefile
+/lib/addons/library.xbmc.addon/project/VS2010Express/Release
+/lib/addons/library.xbmc.addon/project/VS2010Express/Debug
+/lib/addons/library.xbmc.gui/project/VS2010Express/Release
+/lib/addons/library.xbmc.gui/project/VS2010Express/Debug
+/lib/addons/library.xbmc.pvr/project/VS2010Express/Release
+/lib/addons/library.xbmc.pvr/project/VS2010Express/Debug
+
# /lib/cmyth/
lib/cmyth/Makefile
@@ -199,6 +224,33 @@ lib/cmyth/Makefile
/lib/fribidi/libfridibidi/Debug
/lib/fribidi/libfridibidi/Release
+# /lib/gtest
+/lib/gtest/Makefile.in
+/lib/gtest/aclocal.m4
+/lib/gtest/build-aux/config.guess
+/lib/gtest/build-aux/config.h.in
+/lib/gtest/build-aux/config.sub
+/lib/gtest/build-aux/depcomp
+/lib/gtest/build-aux/install-sh
+/lib/gtest/build-aux/ltmain.sh
+/lib/gtest/build-aux/missing
+/lib/gtest/configure
+/lib/gtest/m4/libtool.m4
+/lib/gtest/m4/ltoptions.m4
+/lib/gtest/m4/ltsugar.m4
+/lib/gtest/m4/ltversion.m4
+/lib/gtest/m4/lt~obsolete.m4
+/lib/gtest/Makefile
+/lib/gtest/build-aux/config.h
+/lib/gtest/build-aux/config.h.in~
+/lib/gtest/build-aux/stamp-h1
+/lib/gtest/fused-src/
+/lib/gtest/lib/
+/lib/gtest/libtool
+/lib/gtest/samples/.dirstamp
+/lib/gtest/scripts/gtest-config
+/lib/gtest/src/.dirstamp
+
# /lib/jsoncpp
/lib/jsoncpp/src/lib_json/Makefile
@@ -220,6 +272,11 @@ lib/cmyth/Makefile
/lib/libass/libass/Makefile.in
/lib/libass/libtool
/lib/libass/ltmain.sh
+/lib/libass/m4/libtool.m4
+/lib/libass/m4/ltoptions.m4
+/lib/libass/m4/ltsugar.m4
+/lib/libass/m4/ltversion.m4
+/lib/libass/m4/lt~obsolete.m4
/lib/libass/missing
/lib/libass/shave/libtool.m4
/lib/libass/shave/ltoptions.m4
@@ -303,6 +360,7 @@ lib/cmyth/Makefile
/lib/libapetag/config.h
/lib/libapetag/install-sh
/lib/libapetag/libtool
+/lib/libapetag/m4/lt~obsolete.m4
/lib/libapetag/stamp-h1
# /project
@@ -323,6 +381,8 @@ lib/cmyth/Makefile
/project/BuildDependencies/lib
/project/BuildDependencies/msys
/project/BuildDependencies/scripts/tmp
+/project/BuildDependencies/bin/swig
+/project/BuildDependencies/bin/doxygen
# /project/VS2008Express
/project/VS2008Express/Debug
@@ -537,6 +597,7 @@ lib/cmyth/Makefile
/xbmc/cores/dvdplayer/Makefile
/xbmc/cores/amlplayer/Makefile
+/xbmc/cores/omxplayer/Makefile
# /lib/ffmpeg/
/lib/ffmpeg/config.h
@@ -1094,31 +1155,12 @@ lib/cmyth/Makefile
# /xbmc/interfaces/
/xbmc/interfaces/Makefile
/xbmc/interfaces/python/Makefile
-/xbmc/interfaces/python/xbmcmodule/Makefile
-/xbmc/interfaces/python/linux/Makefile
-/xbmc/interfaces/python/linux/wrapper_python.def
+/xbmc/interfaces/python/generated/
+/xbmc/interfaces/python/test/Makefile
# /xbmc/network/
/xbmc/network/Makefile
-
-/lib/python/Makefile
-/lib/python/Include/pyconfig.h
-/lib/python/Makefile.pre
-/lib/python/Modules/Setup
-/lib/python/Modules/Setup.config
-/lib/python/Modules/Setup.local
-/lib/python/Modules/config.c
-/lib/python/Parser/pgen
-/lib/python/Parser/pgen.exe
-/lib/python/PC/pythonnt_rc.h
-/lib/python/build/
-/lib/python/buildno
-/lib/python/pyconfig.h
-/lib/python/pyconfig.hbak
-/lib/python/python
-/lib/python/python.exe
-/lib/python/Mac/Python/
-/lib/python/PC/pythonnt_rc_d.h
+/xbmc/network/upnp/Makefile
# /lib/libRTV/
/lib/libRTV/Makefile
@@ -1138,6 +1180,12 @@ lib/cmyth/Makefile
/lib/libXDAAP/libXDAAP_win32/Debug
/lib/libXDAAP/libXDAAP_win32/Release
+# /xbmc/osx/
+/xbmc/osx/Makefile
+
+# /portable_data
+/portable_data
+
/xbmc/screensavers/Makefile
/xbmc/screensavers/rsxs-0.9/Makefile
@@ -1237,3 +1285,12 @@ xbmc/visualizations/EGLHelpers/Makefile
/xbmc/visualizations/XBMCProjectM/libprojectM/config.inp
/xbmc/win32/git_rev.h
+
+/addons/library.xbmc.addon/libXBMC_addon.dll
+/addons/library.xbmc.addon/libXBMC_addon.lib
+/addons/library.xbmc.gui/libXBMC_gui.dll
+/addons/library.xbmc.gui/libXBMC_gui.lib
+/addons/library.xbmc.pvr/libXBMC_pvr.dll
+/addons/library.xbmc.pvr/libXBMC_pvr.lib
+
+/pvr-addons
Oops, something went wrong.

0 comments on commit fdedf13

Please sign in to comment.