diff options
| author | McCabe Maxsted | 2009-11-18 21:20:29 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-11-18 21:20:29 -0700 |
| commit | 246146d26f4f9b9aa2869e6f6cef83e4ebf13c27 (patch) | |
| tree | f40f94c1512863f41b426d48bda539a39c160f80 /ChangeLog.txt | |
| parent | Fixed Hide Group Titles preferences option (diff) | |
| download | meta-impy-246146d26f4f9b9aa2869e6f6cef83e4ebf13c27.zip meta-impy-246146d26f4f9b9aa2869e6f6cef83e4ebf13c27.tar.gz meta-impy-246146d26f4f9b9aa2869e6f6cef83e4ebf13c27.tar.bz2 meta-impy-246146d26f4f9b9aa2869e6f6cef83e4ebf13c27.tar.xz | |
Cleaned up a harmless bad merge in llimagej2coj.cpp
Diffstat (limited to '')
| -rw-r--r-- | ChangeLog.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 8d437c9..5061141 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2009-11-18 McCabe Maxsted <hakushakukun@gmail.com> | ||
| 2 | |||
| 3 | * Cleaned up a harmless bad merge in llimagej2coj.cpp. | ||
| 4 | |||
| 5 | modified: linden/indra/llimagej2coj/llimagej2coj.cpp | ||
| 6 | |||
| 7 | |||
| 1 | 2009-11-12 McCabe Maxsted <hakushakukun@gmail.com> | 8 | 2009-11-12 McCabe Maxsted <hakushakukun@gmail.com> |
| 2 | 9 | ||
| 3 | * Fixed Hide Group Titles preferences option. | 10 | * Fixed Hide Group Titles preferences option. |