diff options
| author | McCabe Maxsted | 2009-01-12 11:20:19 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-01-12 11:20:19 -0700 |
| commit | 23250e1e5176fe41a7d930d6729be1cc92688ccb (patch) | |
| tree | 5264414fd37013d9b3114754b9baefacbab4ca9e | |
| parent | Backported 'report abuse' avatar pie menu option (diff) | |
| download | meta-impy-23250e1e5176fe41a7d930d6729be1cc92688ccb.zip meta-impy-23250e1e5176fe41a7d930d6729be1cc92688ccb.tar.gz meta-impy-23250e1e5176fe41a7d930d6729be1cc92688ccb.tar.bz2 meta-impy-23250e1e5176fe41a7d930d6729be1cc92688ccb.tar.xz | |
Backported 'report abuse' avatar pie menu option
| -rw-r--r-- | ChangeLog.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 9b6d8a9..3a7b8fa 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | <<<<<<< HEAD:ChangeLog.txt | ||
| 2 | 2009-01-12 McCabe Maxsted <hakushakukun@gmail.com> | 1 | 2009-01-12 McCabe Maxsted <hakushakukun@gmail.com> |
| 3 | 2 | ||
| 4 | * linden/indra/llcommon/llversionviewer.h | 3 | * linden/indra/llcommon/llversionviewer.h |
| @@ -76,13 +75,13 @@ | |||
| 76 | * linden/indra/newview/llviewermenu.cpp: | 75 | * linden/indra/newview/llviewermenu.cpp: |
| 77 | Added 'create landmark' to land pie menu. | 76 | Added 'create landmark' to land pie menu. |
| 78 | * linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml: | 77 | * linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml: |
| 79 | ======= | 78 | |
| 80 | 2009-01-10 McCabe Maxsted <hakushakukun@gmail.com> | 79 | |
| 80 | McCabe Maxsted <hakushakukun@gmail.com> | ||
| 81 | 81 | ||
| 82 | * linden/indra/newview/llviewermenu.cpp: | 82 | * linden/indra/newview/llviewermenu.cpp: |
| 83 | Backported 'report abuse' avatar pie menu option. | 83 | Backported 'report abuse' avatar pie menu option. |
| 84 | * linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml: | 84 | * linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml: |
| 85 | >>>>>>> pieavreportabuse:ChangeLog.txt | ||
| 86 | Ditto. | 85 | Ditto. |
| 87 | 86 | ||
| 88 | 87 | ||