diff options
| author | Jacek Antonelli | 2008-09-21 17:13:40 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-09-21 17:13:40 -0500 |
| commit | fdb0e4c6f6a182ebba7b00d2748e4df613b3c893 (patch) | |
| tree | 2333f8d4d5747e4f856b08746d5d6759f2d0991c /ChangeLog.txt | |
| parent | Merge branch 'VWR-2896' into menu_viewer (diff) | |
| parent | VWR-1363: Add "Return Object" to the Tools menu. (diff) | |
| download | meta-impy-fdb0e4c6f6a182ebba7b00d2748e4df613b3c893.zip meta-impy-fdb0e4c6f6a182ebba7b00d2748e4df613b3c893.tar.gz meta-impy-fdb0e4c6f6a182ebba7b00d2748e4df613b3c893.tar.bz2 meta-impy-fdb0e4c6f6a182ebba7b00d2748e4df613b3c893.tar.xz | |
Merge branch 'VWR-1363' into menu_viewer
Conflicts:
linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
Diffstat (limited to 'ChangeLog.txt')
| -rw-r--r-- | ChangeLog.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 7dd2814..7bda6cc 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-09-19 McCabe Maxsted <hakushakukun@gmail.com> | ||
| 2 | |||
| 3 | * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml: | ||
| 4 | VWR-1363: Add "Return Object" to the Tools menu. | ||
| 5 | |||
| 1 | 2008-09-19 Jacek Antonelli <jacek.antonelli@gmail.com> | 6 | 2008-09-19 Jacek Antonelli <jacek.antonelli@gmail.com> |
| 2 | 7 | ||
| 3 | * linden/indra/newview/llviewermenu.cpp: | 8 | * linden/indra/newview/llviewermenu.cpp: |