mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-27 04:36:40 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
This commit is contained in:
commit
69649cbcd5
@ -6,9 +6,6 @@ Subject: [PATCH] [cec] rebased PR1794 + fixes for Frodo
|
|||||||
---
|
---
|
||||||
XBMC.xcodeproj/project.pbxproj | 13 +++
|
XBMC.xcodeproj/project.pbxproj | 13 +++
|
||||||
configure.in | 40 +------
|
configure.in | 40 +------
|
||||||
project/BuildDependencies/scripts/libcec_d.txt | 2 +-
|
|
||||||
project/VS2010Express/XBMC.vcxproj | 2 +
|
|
||||||
project/VS2010Express/XBMC.vcxproj.filters | 6 +
|
|
||||||
system/peripherals.xml | 31 ++----
|
system/peripherals.xml | 31 ++----
|
||||||
tools/android/depends/libcec/Makefile | 4 +-
|
tools/android/depends/libcec/Makefile | 4 +-
|
||||||
tools/darwin/depends/libcec/Makefile | 2 +-
|
tools/darwin/depends/libcec/Makefile | 2 +-
|
||||||
@ -134,12 +131,6 @@ index 4769315..4472e3e 100644
|
|||||||
AC_SUBST(USE_MYSQL)
|
AC_SUBST(USE_MYSQL)
|
||||||
AC_SUBST(USE_WEB_SERVER)
|
AC_SUBST(USE_WEB_SERVER)
|
||||||
AC_SUBST(USE_UPNP)
|
AC_SUBST(USE_UPNP)
|
||||||
diff --git a/project/BuildDependencies/scripts/libcec_d.txt b/project/BuildDependencies/scripts/libcec_d.txt
|
|
||||||
index c1419b5..2c7d495 100644
|
|
||||||
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
|
|
||||||
index fb0947e..7e32ccc 100644
|
|
||||||
diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
|
|
||||||
index 53a6c97..52a5373 100644
|
|
||||||
diff --git a/system/peripherals.xml b/system/peripherals.xml
|
diff --git a/system/peripherals.xml b/system/peripherals.xml
|
||||||
index 967b96c..68205df 100644
|
index 967b96c..68205df 100644
|
||||||
--- a/system/peripherals.xml
|
--- a/system/peripherals.xml
|
||||||
|
Loading…
x
Reference in New Issue
Block a user