diff options
| author | Jonathan Yap <none@none> | 2011-03-19 16:29:32 -0400 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2011-03-19 16:29:32 -0400 |
| commit | fbd241da54ad6017825b59c5b0c71086d8b8957a (patch) | |
| tree | 34051dba97afece2416f25954080011d922d910e /indra/newview/skins/minimal/xui/en/menu_picks.xml | |
| parent | 834d0f1ed612c8644e642103096daf7f0b0f44c9 (diff) | |
| parent | 1a7369408c0b2cd15dbdc79d045f3347a8ab47d1 (diff) | |
STORM-1019 Resolve merge conflicts
Diffstat (limited to 'indra/newview/skins/minimal/xui/en/menu_picks.xml')
| -rw-r--r-- | indra/newview/skins/minimal/xui/en/menu_picks.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/skins/minimal/xui/en/menu_picks.xml b/indra/newview/skins/minimal/xui/en/menu_picks.xml new file mode 100644 index 0000000000..fb19c5eb2c --- /dev/null +++ b/indra/newview/skins/minimal/xui/en/menu_picks.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu/> |