aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ChangeLog.txt
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index a5dfa03..fb3f065 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -3,7 +3,12 @@
3=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- 3=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
4 4
52009-11-08 McCabe Maxsted <hakushakukun@gmail.com> 52009-11-08 McCabe Maxsted <hakushakukun@gmail.com>
6 6
7 * Removed unused CMake resource files.
8
9 modified: linden/indra/newview/CMakeLists.txt
10
11
7 * Merged in nearly-done 1.2 with 1.3. 12 * Merged in nearly-done 1.2 with 1.3.
8 13
9 Conflicts: 14 Conflicts: