Permalink
Browse files

Merge branch 'master' into pvr-ppa

  • Loading branch information...
2 parents 522042f + 6196db4 commit 0bae5c63e2ef7e4958123732a49414c695f2ce21 @opdenkamp opdenkamp committed Oct 16, 2011
Showing 783 changed files with 47,281 additions and 41,843 deletions.
View
@@ -50,6 +50,7 @@ config.log
/build/
.DS_Store
*.dSYM
+._*
/tools/darwin/depends/config.site
/tools/darwin/depends/config.site.mk
/tools/darwin/depends/Makefile
@@ -58,11 +59,6 @@ config.log
/tools/darwin/depends/python26/Makefile
/tools/darwin/depends/**/.gitignore
/tools/darwin/depends/**/.installed
-/tools/osx/osx-depends/**/.gitignore
-/tools/osx/osx-depends/**/.installed
-/tools/osx/ios-depends/**/.gitignore
-/tools/osx/ios-depends/**/.installed
-/tools/osx/ios-depends/**/.compiled
.libs/
.deps/
@@ -113,7 +109,6 @@ autom4te.cache
/addons/skin.confluence/media/Textures.xbt
/addons/skin.pm3-hd/media/Textures.xbt
/addons/visualization.dxspectrum/Spectrum_win32dx.vis
-/addons/visualization.glesspectrum/gles_spectrum.vis
/addons/visualization.glspectrum/opengl_spectrum.vis
/addons/visualization.milkdrop/MilkDrop_win32dx.vis
/addons/visualization.projectm/projectM.vis
@@ -138,6 +133,10 @@ autom4te.cache
/xbmc/guilib/Profile
/xbmc/guilib/Profile_FastCap
+# /xbmc/peripherals/
+/xbmc/peripherals/bus/Makefile
+/xbmc/peripherals/devices/Makefile
+
# /lib/
/lib/Makefile
@@ -195,6 +194,9 @@ lib/cmyth/Makefile
/lib/cpluff/libcpluff/win32/Debug
/lib/cpluff/libcpluff/win32/Release
+# /lib/libcec
+/lib/libcec/libcec
+
# /lib/enca
/lib/enca/libenca_win32/Debug
/lib/enca/libenca_win32/Release
@@ -382,6 +384,10 @@ lib/cmyth/Makefile
/system/ssh.dll
/system/sqlite3.dll
/system/libsamplerate-0.dll
+/system/libnfs.dll
+/system/dnssd.dll
+/system/libcec.dll
+/system/pthreadVC2.dll
# /system/cdrip
/system/cdrip/lame_enc.dll
@@ -432,6 +438,8 @@ lib/cmyth/Makefile
# /system/webserver
/system/webserver
+/system/airplay
+
# /system
/system/zlib1.dll
@@ -1212,12 +1220,24 @@ lib/cmyth/Makefile
/xbmc/visualizations/DirectXSpectrum/Release (DirectX)
/xbmc/visualizations/Goom/Makefile
+/xbmc/visualizations/Goom/goom2k4-0/aclocal.m4
+/xbmc/visualizations/Goom/goom2k4-0/configure
+/xbmc/visualizations/Goom/goom2k4-0/Makefile.in
+/xbmc/visualizations/Goom/goom2k4-0/config.guess
+/xbmc/visualizations/Goom/goom2k4-0/config.sub
+/xbmc/visualizations/Goom/goom2k4-0/depcomp
+/xbmc/visualizations/Goom/goom2k4-0/install-sh
+/xbmc/visualizations/Goom/goom2k4-0/ltmain.sh
+/xbmc/visualizations/Goom/goom2k4-0/missing
+/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/Makefile.in
+/xbmc/visualizations/Goom/goom2k4-0/src/Makefile.in
+/xbmc/visualizations/Goom/goom2k4-0/xmms-goom/Makefile.in
+/xbmc/visualizations/Goom/goom2k4-0/ylwrap
/xbmc/visualizations/Milkdrop/Debug
/xbmc/visualizations/Milkdrop/Release
/xbmc/visualizations/OpenGLSpectrum/Makefile
-/xbmc/visualizations/EGLSpectrum/Makefile
/xbmc/visualizations/WaveForm/Makefile
/xbmc/visualizations/WaveForm/Debug (DirectX)
View
@@ -0,0 +1,4 @@
+[submodule "touched"]
+ path = addons/skin.touched
+ url = git://github.com/xbmc/skin.touched.git
+ ignore = all
Oops, something went wrong.

0 comments on commit 0bae5c6

Please sign in to comment.