diff options
author | David Seikel | 2011-03-20 17:02:40 +1000 |
---|---|---|
committer | David Seikel | 2011-03-20 17:02:40 +1000 |
commit | 8c15fcec590c68337b8aa05d17793cd3c2a48068 (patch) | |
tree | e233ecfa79c6fe22f47dc0eba44c0300dc0daa71 /.gitignore | |
parent | The half arsed IRC support was broken. It's still not working, though it wor... (diff) | |
parent | Merge remote-tracking branch 'jacek/exp' into exp (diff) | |
download | meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.zip meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.gz meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.bz2 meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.xz |
Merge remote-tracking branch 'mccabe/exp' into weekly
Conflicts: (Keeping these around as a record, there was some strangeness.
.gitignore
linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
linden/indra/newview/llfloaterregioninfo.cpp
linden/indra/newview/llfloatertos.cpp
linden/indra/newview/llpanellogin.cpp
linden/indra/newview/skins/default/html/en-us/loading-error/index.html
linden/indra/newview/skins/default/html/en-us/loading/loading.html
linden/indra/newview/skins/default/xui/en-us/floater_about.xml
linden/install.xml
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -38,4 +38,5 @@ linden/installed.xml | |||
38 | ChangeLog.txt | 38 | ChangeLog.txt |
39 | .DS_Store | 39 | .DS_Store |
40 | *.zip | 40 | *.zip |
41 | linden/indra/newview/mozilla-universal-darwin.tgz \ No newline at end of file | 41 | linden/indra/newview/mozilla-universal-darwin.tgz |
42 | |||