jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-04 08:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

projects: fix merge conflicts

Browse Source
This commit is contained in:
Gujs 2011-03-15 18:17:15 +01:00
parent b15a7f4d98
commit 87d0a424f4
4 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
projects/ATV/options
View File

@ -77,19 +77,14 @@
# Project CFLAGS # Project CFLAGS
PROJECT_CFLAGS="" PROJECT_CFLAGS=""
<<<<<<< HEAD
# Mediacenter to use (xbmc / xbmc-pvr / no)
MEDIACENTER="xbmc-pvr"
=======
# Bootloader to use (syslinux / u-boot) # Bootloader to use (syslinux / u-boot)
BOOTLOADER="" BOOTLOADER=""
# Configuration for u-boot # Configuration for u-boot
UBOOT_CONFIG="" UBOOT_CONFIG=""
# Mediacenter to use (xbmc / no) # Mediacenter to use (xbmc / xbmc-pvr / no)
MEDIACENTER="xbmc" MEDIACENTER="xbmc-pvr"
>>>>>>> master
# Skins to install (Confluence) # Skins to install (Confluence)
SKINS="Confluence" SKINS="Confluence"

9
projects/Generic/options
View File

@ -77,19 +77,14 @@
# Project CFLAGS # Project CFLAGS
PROJECT_CFLAGS="-mmmx -msse -msse2 -mfpmath=sse" PROJECT_CFLAGS="-mmmx -msse -msse2 -mfpmath=sse"
<<<<<<< HEAD
# Mediacenter to use (xbmc / xbmc-pvr / no)
MEDIACENTER="xbmc-pvr"
=======
# Bootloader to use (syslinux / u-boot) # Bootloader to use (syslinux / u-boot)
BOOTLOADER="syslinux" BOOTLOADER="syslinux"
# Configuration for u-boot # Configuration for u-boot
UBOOT_CONFIG="" UBOOT_CONFIG=""
# Mediacenter to use (xbmc / no) # Mediacenter to use (xbmc / xbmc-pvr / no)
MEDIACENTER="xbmc" MEDIACENTER="xbmc-pvr"
>>>>>>> master
# Skins to install (Confluence) # Skins to install (Confluence)
SKINS="Confluence" SKINS="Confluence"

9
projects/ION/options
View File

@ -77,19 +77,14 @@
# Project CFLAGS # Project CFLAGS
PROJECT_CFLAGS="-mfpmath=sse -ftree-vectorize -mmovbe" PROJECT_CFLAGS="-mfpmath=sse -ftree-vectorize -mmovbe"
<<<<<<< HEAD
# Mediacenter to use (xbmc / xbmc-pvr / no)
MEDIACENTER="xbmc-pvr"
=======
# Bootloader to use (syslinux / u-boot) # Bootloader to use (syslinux / u-boot)
BOOTLOADER="syslinux" BOOTLOADER="syslinux"
# Configuration for u-boot # Configuration for u-boot
UBOOT_CONFIG="" UBOOT_CONFIG=""
# Mediacenter to use (xbmc / no) # Mediacenter to use (xbmc / xbmc-pvr / no)
MEDIACENTER="xbmc" MEDIACENTER="xbmc-pvr"
>>>>>>> master
# Skins to install (Confluence) # Skins to install (Confluence)
SKINS="Confluence" SKINS="Confluence"

9
projects/Intel/options
View File

@ -77,19 +77,14 @@
# Project CFLAGS # Project CFLAGS
PROJECT_CFLAGS="" PROJECT_CFLAGS=""
<<<<<<< HEAD
# Mediacenter to use (xbmc / xbmc-pvr / no)
MEDIACENTER="xbmc-pvr"
=======
# Bootloader to use (syslinux / u-boot) # Bootloader to use (syslinux / u-boot)
BOOTLOADER="syslinux" BOOTLOADER="syslinux"
# Configuration for u-boot # Configuration for u-boot
UBOOT_CONFIG="" UBOOT_CONFIG=""
# Mediacenter to use (xbmc / no) # Mediacenter to use (xbmc / xbmc-pvr / no)
MEDIACENTER="xbmc" MEDIACENTER="xbmc-pvr"
>>>>>>> master
# Skins to install (Confluence) # Skins to install (Confluence)
SKINS="Confluence" SKINS="Confluence"