diff options
| author | Jonathan Yap <none@none> | 2011-02-25 20:21:54 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2011-02-25 20:21:54 -0500 |
| commit | 513fdff9cd8969d7351016902d8304306f739f4e (patch) | |
| tree | a42da46c9be6c89b96cbf02f7125ae009890a787 /indra/newview/skins/default/xui/pl/floater_im_container.xml | |
| parent | eff712570d389d1b7b36153c48b17d906d5eada3 (diff) | |
| parent | 9962560f57eb4bcf1b3451f5d86c963d5d6fcf5c (diff) | |
STORM-990 merge with current v-d & fixed merge conflict
Diffstat (limited to 'indra/newview/skins/default/xui/pl/floater_im_container.xml')
0 files changed, 0 insertions, 0 deletions