diff options
| author | Jacek Antonelli | 2008-09-22 14:54:55 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-09-22 14:54:55 -0500 |
| commit | aff0eeca9e52ecf4af753ced5742f49fa6b9d3c7 (patch) | |
| tree | db867cf6defce8d965b244c1445bb2e983c317b1 /ChangeLog.txt | |
| parent | Merge branch 'land-tools' into next-merge (diff) | |
| parent | VWR-2072: New Feature -> UI -> IM -> Teleport (other person) Button. (diff) | |
| download | meta-impy-aff0eeca9e52ecf4af753ced5742f49fa6b9d3c7.zip meta-impy-aff0eeca9e52ecf4af753ced5742f49fa6b9d3c7.tar.gz meta-impy-aff0eeca9e52ecf4af753ced5742f49fa6b9d3c7.tar.bz2 meta-impy-aff0eeca9e52ecf4af753ced5742f49fa6b9d3c7.tar.xz | |
Merge branch 'VWR-2072' into next-merge
Diffstat (limited to 'ChangeLog.txt')
| -rw-r--r-- | ChangeLog.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 361fe54..309eb86 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
| @@ -43,6 +43,15 @@ | |||
| 43 | * linden/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml: | 43 | * linden/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml: |
| 44 | Ditto. | 44 | Ditto. |
| 45 | 45 | ||
| 46 | 2008-09-20 Paul Churchill <pnolan@dsl.pipex.com> | ||
| 47 | |||
| 48 | * linden/indra/newview/llimpanel.cpp: | ||
| 49 | VWR-2072: New Feature -> UI -> IM -> Teleport (other person) Button. | ||
| 50 | * linden/indra/newview/llimpanel.h: | ||
| 51 | Ditto. | ||
| 52 | * linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml: | ||
| 53 | Ditto. | ||
| 54 | |||
| 46 | 2008-09-19 Gigs Taggart <gigstaggart@gmail.com> | 55 | 2008-09-19 Gigs Taggart <gigstaggart@gmail.com> |
| 47 | 56 | ||
| 48 | * linden/indra/newview/app_settings/settings.xml: | 57 | * linden/indra/newview/app_settings/settings.xml: |