diff options
| author | David Walter Seikel | 2011-12-05 16:22:37 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2011-12-05 16:22:37 +1000 |
| commit | 3823dbda902c1f68dd25055edca0602e1c74d804 (patch) | |
| tree | bf6850779d234070ef71eae6e6e5ca27c7b54457 /linden/indra/newview/skins/default/xui/en-us | |
| parent | Revert "Another possible fix for misplaced HUDs?" (diff) | |
| parent | Linux: allow cross compiling the 32bit viewer on a x86_64 platform (diff) | |
| download | meta-impy-3823dbda902c1f68dd25055edca0602e1c74d804.zip meta-impy-3823dbda902c1f68dd25055edca0602e1c74d804.tar.gz meta-impy-3823dbda902c1f68dd25055edca0602e1c74d804.tar.bz2 meta-impy-3823dbda902c1f68dd25055edca0602e1c74d804.tar.xz | |
Merge branch 'next' of git://github.com/ArminW/imprudence into next
Conflicts:
linden/indra/newview/viewer_manifest.py
Conflicted with the OTR stuff, simple fix.
Diffstat (limited to 'linden/indra/newview/skins/default/xui/en-us')
0 files changed, 0 insertions, 0 deletions