aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/.gitignore
diff options
context:
space:
mode:
authorAleric Inglewood2010-10-22 03:04:49 +0200
committerAleric Inglewood2010-10-22 03:04:49 +0200
commit4e659351474096d1a7b835a69af13cbdf84257f3 (patch)
tree912cc63d3e53fef3360fbcb908d254e5253dd88e /.gitignore
parentLindenUserDir fixes, part 2. (diff)
parentMerge branch 'weekly' of http://github.com/imprudence/imprudence into weekly (diff)
downloadmeta-impy-4e659351474096d1a7b835a69af13cbdf84257f3.zip
meta-impy-4e659351474096d1a7b835a69af13cbdf84257f3.tar.gz
meta-impy-4e659351474096d1a7b835a69af13cbdf84257f3.tar.bz2
meta-impy-4e659351474096d1a7b835a69af13cbdf84257f3.tar.xz
Merge branch 'weekly' into webkit_plugins
Conflicts: linden/indra/cmake/GStreamer.cmake linden/indra/cmake/GStreamer.cmake was deleted: we're going to try to use system libs, so any improvements that have been made in weekly have been invane. linden/indra/newview/llstartup.cpp Trivial #include collision. One include added another removed. Fixed. linden/indra/newview/lltoolpie.cpp Collision with RLV, pretty trivial. Fixed. linden/indra/newview/viewer_manifest.py Trivial White space fix collision with commenting out of gstreamer libs. Fixed.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 1295eaf..877e3ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@ linden/installed.xml
63ChangeLog.txt 63ChangeLog.txt
64.DS_Store 64.DS_Store
65*.zip 65*.zip
66linden/indra/newview/mozilla-universal-darwin.tgz \ No newline at end of file