diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-09-22 17:11:28 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-09-22 17:11:28 -0700 |
| commit | a5c5929a84952fa1d6e227deea637c2d9596331e (patch) | |
| tree | d6ebcf0157380f40707dcf0722241a4f5d3130d9 /indra/newview/skins/default/xui/da/floater_god_tools.xml | |
| parent | 82dd0453aa2a344b6de3c289d367ab6847e5f8d2 (diff) | |
Merge problems with this file - this fixes them
Diffstat (limited to 'indra/newview/skins/default/xui/da/floater_god_tools.xml')
0 files changed, 0 insertions, 0 deletions