diff options
author | Adam Moss <moss@lindenlab.com> | 2009-02-03 17:56:26 +0000 |
---|---|---|
committer | Adam Moss <moss@lindenlab.com> | 2009-02-03 17:56:26 +0000 |
commit | e188badaf29a1a02307f93864eed6737096bd9a1 (patch) | |
tree | 767259ad3385fd9ede9722e04752bea008469f8c /indra/newview/res/bitmap2.bmp | |
parent | 4ad54702fce32905402cb6055c085ac14de188a2 (diff) |
QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314
Whew.
Diffstat (limited to 'indra/newview/res/bitmap2.bmp')
-rw-r--r-- | indra/newview/res/bitmap2.bmp | bin | 25118 -> 0 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/res/bitmap2.bmp b/indra/newview/res/bitmap2.bmp Binary files differdeleted file mode 100644 index 770b07558c..0000000000 --- a/indra/newview/res/bitmap2.bmp +++ /dev/null |