diff options
| author | Jacek Antonelli | 2009-11-18 23:32:10 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2009-11-18 23:32:10 -0600 |
| commit | 8fd7a7988854afea9d572b0845b8d7aea4426cc0 (patch) | |
| tree | 4af44ea7541b806c9f379956dd017e5d829d469b /ChangeLog.txt | |
| parent | SNOW-108: Fast timers fail on non i386 systems (diff) | |
| parent | Fixed a compile blocker in LLVoSky::stepCurrent(). (diff) | |
| download | meta-impy-8fd7a7988854afea9d572b0845b8d7aea4426cc0.zip meta-impy-8fd7a7988854afea9d572b0845b8d7aea4426cc0.tar.gz meta-impy-8fd7a7988854afea9d572b0845b8d7aea4426cc0.tar.bz2 meta-impy-8fd7a7988854afea9d572b0845b8d7aea4426cc0.tar.xz | |
Merge remote branch 'mccabe/next' into next
Diffstat (limited to 'ChangeLog.txt')
| -rw-r--r-- | ChangeLog.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index cc20925..ee81684 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
| @@ -88,6 +88,13 @@ | |||
| 88 | modified: linden/install.xml | 88 | modified: linden/install.xml |
| 89 | 89 | ||
| 90 | 90 | ||
| 91 | 2009-11-18 McCabe Maxsted <hakushakukun@gmail.com> | ||
| 92 | |||
| 93 | * Cleaned up a harmless bad merge in llimagej2coj.cpp. | ||
| 94 | |||
| 95 | modified: linden/indra/llimagej2coj/llimagej2coj.cpp | ||
| 96 | |||
| 97 | |||
| 91 | 2009-11-15 Jacek Antonelli <jacek.antonelli@gmail.com> | 98 | 2009-11-15 Jacek Antonelli <jacek.antonelli@gmail.com> |
| 92 | 99 | ||
| 93 | * Fixed a warning about converting string literal to gchar*. | 100 | * Fixed a warning about converting string literal to gchar*. |