diff options
| author | Aleric Inglewood | 2010-10-22 03:04:49 +0200 |
|---|---|---|
| committer | Aleric Inglewood | 2010-10-22 03:04:49 +0200 |
| commit | 4e659351474096d1a7b835a69af13cbdf84257f3 (patch) | |
| tree | 912cc63d3e53fef3360fbcb908d254e5253dd88e /.gitignore | |
| parent | LindenUserDir fixes, part 2. (diff) | |
| parent | Merge branch 'weekly' of http://github.com/imprudence/imprudence into weekly (diff) | |
| download | meta-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-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
| @@ -63,3 +63,4 @@ linden/installed.xml | |||
| 63 | ChangeLog.txt | 63 | ChangeLog.txt |
| 64 | .DS_Store | 64 | .DS_Store |
| 65 | *.zip | 65 | *.zip |
| 66 | linden/indra/newview/mozilla-universal-darwin.tgz \ No newline at end of file | ||