diff options
| author | Jacek Antonelli | 2011-05-18 16:54:33 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2011-05-18 21:50:11 -0500 |
| commit | 718d23b821e2a293e01e6086b0d0ae57263febca (patch) | |
| tree | 15c467f49db6e4c5b17343de429ba227629ce6ec /linden/indra/llmessage/llsdhttpserver.h | |
| parent | Changed the cache and settings file names back to non-Experimental. (diff) | |
| parent | Use a more recent dbusglib package on Linux32. (diff) | |
| download | meta-impy-718d23b821e2a293e01e6086b0d0ae57263febca.zip meta-impy-718d23b821e2a293e01e6086b0d0ae57263febca.tar.gz meta-impy-718d23b821e2a293e01e6086b0d0ae57263febca.tar.bz2 meta-impy-718d23b821e2a293e01e6086b0d0ae57263febca.tar.xz | |
Merge branch '1.3-maint' into next
Conflicts:
linden/indra/llcommon/CMakeLists.txt
linden/indra/newview/llvoavatar.cpp
linden/indra/newview/viewer_manifest.py
Diffstat (limited to 'linden/indra/llmessage/llsdhttpserver.h')
0 files changed, 0 insertions, 0 deletions