From 87d0a424f4bd0710170abe98389909dd94c218bf Mon Sep 17 00:00:00 2001 From: Gujs Date: Tue, 15 Mar 2011 18:17:15 +0100 Subject: [PATCH] projects: fix merge conflicts --- projects/ATV/options | 9 ++------- projects/Generic/options | 9 ++------- projects/ION/options | 9 ++------- projects/Intel/options | 9 ++------- 4 files changed, 8 insertions(+), 28 deletions(-) diff --git a/projects/ATV/options b/projects/ATV/options index 3664c9fcdf..fa368909e5 100644 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -77,19 +77,14 @@ # Project CFLAGS PROJECT_CFLAGS="" -<<<<<<< HEAD -# Mediacenter to use (xbmc / xbmc-pvr / no) - MEDIACENTER="xbmc-pvr" -======= # Bootloader to use (syslinux / u-boot) BOOTLOADER="" # Configuration for u-boot UBOOT_CONFIG="" -# Mediacenter to use (xbmc / no) - MEDIACENTER="xbmc" ->>>>>>> master +# Mediacenter to use (xbmc / xbmc-pvr / no) + MEDIACENTER="xbmc-pvr" # Skins to install (Confluence) SKINS="Confluence" diff --git a/projects/Generic/options b/projects/Generic/options index 041aab1006..f4c183d30b 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -77,19 +77,14 @@ # Project CFLAGS 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="syslinux" # Configuration for u-boot UBOOT_CONFIG="" -# Mediacenter to use (xbmc / no) - MEDIACENTER="xbmc" ->>>>>>> master +# Mediacenter to use (xbmc / xbmc-pvr / no) + MEDIACENTER="xbmc-pvr" # Skins to install (Confluence) SKINS="Confluence" diff --git a/projects/ION/options b/projects/ION/options index 1f8dbb5c27..498ee472a7 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -77,19 +77,14 @@ # Project CFLAGS 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="syslinux" # Configuration for u-boot UBOOT_CONFIG="" -# Mediacenter to use (xbmc / no) - MEDIACENTER="xbmc" ->>>>>>> master +# Mediacenter to use (xbmc / xbmc-pvr / no) + MEDIACENTER="xbmc-pvr" # Skins to install (Confluence) SKINS="Confluence" diff --git a/projects/Intel/options b/projects/Intel/options index 0ac17cf593..033c53b298 100644 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -77,19 +77,14 @@ # Project CFLAGS PROJECT_CFLAGS="" -<<<<<<< HEAD -# Mediacenter to use (xbmc / xbmc-pvr / no) - MEDIACENTER="xbmc-pvr" -======= # Bootloader to use (syslinux / u-boot) BOOTLOADER="syslinux" # Configuration for u-boot UBOOT_CONFIG="" -# Mediacenter to use (xbmc / no) - MEDIACENTER="xbmc" ->>>>>>> master +# Mediacenter to use (xbmc / xbmc-pvr / no) + MEDIACENTER="xbmc-pvr" # Skins to install (Confluence) SKINS="Confluence"