diff options
| author | McCabe Maxsted | 2009-09-27 17:06:50 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-09-27 17:06:50 -0700 |
| commit | 861d77064048b0001e562847c8cf9adaac56cb57 (patch) | |
| tree | b498b1d955a82a2798d5914e3b2d7c3c363ea200 /ChangeLog.txt | |
| parent | Fixed JPEG quality slider displaying over high-res checkbox in snapshot float... (diff) | |
| download | meta-impy-861d77064048b0001e562847c8cf9adaac56cb57.zip meta-impy-861d77064048b0001e562847c8cf9adaac56cb57.tar.gz meta-impy-861d77064048b0001e562847c8cf9adaac56cb57.tar.bz2 meta-impy-861d77064048b0001e562847c8cf9adaac56cb57.tar.xz | |
Fixed bad merge in llnetmap.cpp
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 07e551a..541e740 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2009-09-27 McCabe Maxsted <hakushakukun@gmail.com> | 1 | 2009-09-27 McCabe Maxsted <hakushakukun@gmail.com> |
| 2 | 2 | ||
| 3 | * Fixed bad merge in llnetmap.cpp. | ||
| 4 | |||
| 5 | modified: linden/indra/newview/llnetmap.cpp | ||
| 6 | |||
| 7 | |||
| 3 | * Fixed JPEG quality slider displaying over high-res checkbox in snapshot floater (IMP-140). | 8 | * Fixed JPEG quality slider displaying over high-res checkbox in snapshot floater (IMP-140). |
| 4 | 9 | ||
| 5 | modified: linden/indra/newview/llfloatersnapshot.cpp | 10 | modified: linden/indra/newview/llfloatersnapshot.cpp |