diff options
| author | David Walter Seikel | 2011-12-03 18:50:34 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2011-12-03 18:50:34 +1000 |
| commit | d3b9f715f0ad9516fa350a5c0b83330b733ee0f9 (patch) | |
| tree | e1481a7b83ae6f4fa0a88c4eebb6dbecd83e86fd /linden/indra/newview/skins/pslpurple/textures/closebox.tga | |
| parent | Another possible fix for misplaced HUDs? (diff) | |
| parent | Made the voice license window resizable (diff) | |
| download | meta-impy-d3b9f715f0ad9516fa350a5c0b83330b733ee0f9.zip meta-impy-d3b9f715f0ad9516fa350a5c0b83330b733ee0f9.tar.gz meta-impy-d3b9f715f0ad9516fa350a5c0b83330b733ee0f9.tar.bz2 meta-impy-d3b9f715f0ad9516fa350a5c0b83330b733ee0f9.tar.xz | |
Merge branch 'next' of git://github.com/imprudence/imprudence into next
Removed the new "Set your own Imprudence tag colour feature". Should check though, might be bits left that where not obvious.
Conflicts:
.gitignore
linden/indra/cmake/00-Common.cmake
linden/indra/newview/llvoavatar.cpp
linden/indra/newview/res/viewerRes.rc
linden/indra/newview/skins/default/xui/en-us/panel_login.xml
linden/indra/newview/viewer_manifest.py
linden/indra/newview/viewerinfo.cpp
The usual branding conflicts.
Diffstat (limited to 'linden/indra/newview/skins/pslpurple/textures/closebox.tga')
0 files changed, 0 insertions, 0 deletions