From 0ee6701062d0506a725cd4ba9cd533ec4c46eb68 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 26 Sep 2009 14:55:17 -0500 Subject: Cleaned up an old bad merge in ChangeLog.txt. --- ChangeLog.txt | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 4327139..b53a4a3 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -538,8 +538,6 @@ * Fixed ground sit menu entry missing check. -<<<<<<< HEAD -======= modified: linden/indra/newview/llviewermenu.cpp modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml @@ -548,22 +546,10 @@ * Converted RLVa menu items to XUI. ->>>>>>> mccabe/1.2.0-next modified: linden/indra/newview/llviewermenu.cpp modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml -<<<<<<< HEAD -2009-09-05 Jacek Antonelli <jacek.antonelli@gmail.com> - - * Converted RLVa menu items to XUI. - - modified: linden/indra/newview/llviewermenu.cpp - modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml - - -======= ->>>>>>> mccabe/1.2.0-next 2009-09-04 Jacek Antonelli <jacek.antonelli@gmail.com> * Applied Kitty Barnett's RLVa 1.0.1h (Restrained Life) patch. -- cgit v1.1