diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2012-11-14 16:00:02 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2012-11-14 16:00:02 -0500 |
commit | b344612e4c99ea57b98e88d5569f50fed1dd8955 (patch) | |
tree | 7a4c94a02862741bba95becc80e7cdac782d091e /indra/newview/skins/default/xui/da/floater_lagmeter.xml | |
parent | 852e60859977a6a2b088d8c99ae7350fe3a3d587 (diff) |
DRTVWR-241: resolve merge conflict with viewer-development.
LLUI::setupPaths() went away with DRTVWR-210.
Diffstat (limited to 'indra/newview/skins/default/xui/da/floater_lagmeter.xml')
0 files changed, 0 insertions, 0 deletions