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 /linden/indra/newview/llnotify.cpp | |
| 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 'linden/indra/newview/llnotify.cpp')
| -rw-r--r-- | linden/indra/newview/llnotify.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llnotify.cpp b/linden/indra/newview/llnotify.cpp index 1a7b247..b0f5f91 100644 --- a/linden/indra/newview/llnotify.cpp +++ b/linden/indra/newview/llnotify.cpp | |||
| @@ -57,7 +57,7 @@ | |||
| 57 | 57 | ||
| 58 | #include "hippoGridManager.h" | 58 | #include "hippoGridManager.h" |
| 59 | 59 | ||
| 60 | // [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-10 (RLVa-1.0.0e) | Added: RLVa-0.2.0b | 60 | // [RLVa:KB] - Version: 1.23.4 |
| 61 | #include "rlvhandler.h" | 61 | #include "rlvhandler.h" |
| 62 | // [/RLVa:KB] | 62 | // [/RLVa:KB] |
| 63 | 63 | ||