aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rw-r--r--ChangeLog.txt5
2 files changed, 12 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index f0b1689..353cb19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@ linden/indra/newview/vivox-runtime/
32linden/libraries/ 32linden/libraries/
33linden/indra/lib_releasefordownload_client/ 33linden/indra/lib_releasefordownload_client/
34linden/indra/llwindow/glh/ 34linden/indra/llwindow/glh/
35*.pyc
35 36
36 37
37# COMPILED STUFF 38# COMPILED STUFF
@@ -41,3 +42,9 @@ linden/installed.xml
41linden/indra/CMakeFiles 42linden/indra/CMakeFiles
42linden/indra/temp 43linden/indra/temp
43linden/indra/test_apps 44linden/indra/test_apps
45
46
47# PATCHES
48
49*.diff
50*.patch
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 1ba82f6..bae9cf1 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -13,6 +13,11 @@
13 new file: linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml 13 new file: linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
14 new file: linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml 14 new file: linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
15 15
16
17 * Added patch and .pyc files to .gitignore.
18
19 modified: .gitignore
20
16 21
172009-06-10 McCabe Maxsted <hakushakukun@gmail.com> 222009-06-10 McCabe Maxsted <hakushakukun@gmail.com>
18 23