diff options
author | McCabe Maxsted | 2009-11-18 23:03:38 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-11-18 23:03:38 -0700 |
commit | 1fde9651c1266edcfd9513bfd758986ebca0f6b2 (patch) | |
tree | 55454b21ae759bc9d8fbe7cb2d802cffa48fadff /ChangeLog.txt | |
parent | Removed old unused reference to gProductName in windows updater (diff) | |
parent | Merge remote branch 'mccabe/next' into next (diff) | |
download | meta-impy-1fde9651c1266edcfd9513bfd758986ebca0f6b2.zip meta-impy-1fde9651c1266edcfd9513bfd758986ebca0f6b2.tar.gz meta-impy-1fde9651c1266edcfd9513bfd758986ebca0f6b2.tar.bz2 meta-impy-1fde9651c1266edcfd9513bfd758986ebca0f6b2.tar.xz |
Merge commit 'jacek/next' into next
Diffstat (limited to 'ChangeLog.txt')
-rw-r--r-- | ChangeLog.txt | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index d0473f0..33c9aac 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,5 +1,29 @@ | |||
1 | 2009-11-18 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2009-11-18 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 2 | ||
3 | * SNOW-108: Fast timers fail on non i386 systems | ||
4 | Patch by Robin Cornelius | ||
5 | |||
6 | modified: doc/contributions.txt | ||
7 | modified: indra/llcommon/llfasttimer.cpp | ||
8 | modified: indra/llcommon/llfasttimer.h | ||
9 | |||
10 | |||
11 | * Added "File > Export Selected Objects..." | ||
12 | |||
13 | modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | ||
14 | |||
15 | |||
16 | * Added "(L$[COST] per texture)" to "Import + Upload..." | ||
17 | |||
18 | modified: linden/indra/newview/llviewermenu.cpp | ||
19 | modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | ||
20 | |||
21 | |||
22 | * Renamed menu items: "Import Object..." and "Import + Upload..." | ||
23 | |||
24 | modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | ||
25 | |||
26 | |||
3 | * Fixed a compile blocker in LLVoSky::stepCurrent(). | 27 | * Fixed a compile blocker in LLVoSky::stepCurrent(). |
4 | 28 | ||
5 | modified: linden/indra/newview/llvosky.h | 29 | modified: linden/indra/newview/llvosky.h |