diff options
-rw-r--r-- | .gitignore | 7 | ||||
-rw-r--r-- | ChangeLog.txt | 5 |
2 files changed, 12 insertions, 0 deletions
@@ -32,6 +32,7 @@ linden/indra/newview/vivox-runtime/ | |||
32 | linden/libraries/ | 32 | linden/libraries/ |
33 | linden/indra/lib_releasefordownload_client/ | 33 | linden/indra/lib_releasefordownload_client/ |
34 | linden/indra/llwindow/glh/ | 34 | linden/indra/llwindow/glh/ |
35 | *.pyc | ||
35 | 36 | ||
36 | 37 | ||
37 | # COMPILED STUFF | 38 | # COMPILED STUFF |
@@ -41,3 +42,9 @@ linden/installed.xml | |||
41 | linden/indra/CMakeFiles | 42 | linden/indra/CMakeFiles |
42 | linden/indra/temp | 43 | linden/indra/temp |
43 | linden/indra/test_apps | 44 | linden/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 | ||
17 | 2009-06-10 McCabe Maxsted <hakushakukun@gmail.com> | 22 | 2009-06-10 McCabe Maxsted <hakushakukun@gmail.com> |
18 | 23 | ||