diff options
| author | McCabe Maxsted | 2010-08-28 03:02:19 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-08-28 05:02:08 -0700 |
| commit | e46d90a82f6fbc824dffe0f4f53aca70f30e233a (patch) | |
| tree | 284ffa2e8a36e3ce39bebaaf97dbf445f8acca2c /linden/indra/newview/llfloaterbump.cpp | |
| parent | Updated RELEASE_NOTES.txt for 1.3.0 RC2. (diff) | |
| download | meta-impy-e46d90a82f6fbc824dffe0f4f53aca70f30e233a.zip meta-impy-e46d90a82f6fbc824dffe0f4f53aca70f30e233a.tar.gz meta-impy-e46d90a82f6fbc824dffe0f4f53aca70f30e233a.tar.bz2 meta-impy-e46d90a82f6fbc824dffe0f4f53aca70f30e233a.tar.xz | |
Fixed unresolved merge conflict in xui/fr/floater_html.xml
Diffstat (limited to 'linden/indra/newview/llfloaterbump.cpp')
0 files changed, 0 insertions, 0 deletions