From 23250e1e5176fe41a7d930d6729be1cc92688ccb Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Mon, 12 Jan 2009 11:20:19 -0700 Subject: Backported 'report abuse' avatar pie menu option --- ChangeLog.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'ChangeLog.txt') diff --git a/ChangeLog.txt b/ChangeLog.txt index 9b6d8a9..3a7b8fa 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,3 @@ -<<<<<<< HEAD:ChangeLog.txt 2009-01-12 McCabe Maxsted * linden/indra/llcommon/llversionviewer.h @@ -76,13 +75,13 @@ * linden/indra/newview/llviewermenu.cpp: Added 'create landmark' to land pie menu. * linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml: -======= -2009-01-10 McCabe Maxsted + + + McCabe Maxsted * linden/indra/newview/llviewermenu.cpp: Backported 'report abuse' avatar pie menu option. * linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml: ->>>>>>> pieavreportabuse:ChangeLog.txt Ditto. -- cgit v1.1