From df82325063d61b92cac749c11b7057abf7d769e8 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 7 Sep 2010 18:00:34 -0700
Subject: Removed some bad merge entries from newview/CMakeLists.txt

---
 linden/indra/newview/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index aef0b44..b576ccd 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1139,8 +1139,6 @@ set(viewer_XUI_FILES
 
 
     )
-list(APPEND viewer_XUI_FILES ${viewer_XUI_FILE_GLOB_LIST})
-list(SORT viewer_XUI_FILES)
 
 list(APPEND viewer_XUI_FILES ${viewer_XUI_FILE_GLOB_LIST})
 list(SORT viewer_XUI_FILES)
-- 
cgit v1.1