diff options
author | McCabe Maxsted | 2010-01-01 23:10:43 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-01-01 23:10:43 -0700 |
commit | 383efab805a073174bfe699adb5e1b0d1a20f1ea (patch) | |
tree | cb7fd894b635898502bd65226212de346ce527c7 /.gitignore | |
parent | Fixed panel_radar.xml missing from newview\CMakeLists.txt (diff) | |
parent | Merge branch 'mimikry' into next (diff) | |
download | meta-impy-383efab805a073174bfe699adb5e1b0d1a20f1ea.zip meta-impy-383efab805a073174bfe699adb5e1b0d1a20f1ea.tar.gz meta-impy-383efab805a073174bfe699adb5e1b0d1a20f1ea.tar.bz2 meta-impy-383efab805a073174bfe699adb5e1b0d1a20f1ea.tar.xz |
Merge commit '76dd2a2c2395e50fd31' into next
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -48,7 +48,6 @@ linden/installed.xml | |||
48 | *.diff* | 48 | *.diff* |
49 | *.patch* | 49 | *.patch* |
50 | 50 | ||
51 | |||
52 | # MISCELLANEOUS | 51 | # MISCELLANEOUS |
53 | 52 | ||
54 | .DS_Store | 53 | .DS_Store |