Merge branch 'master' into meshupload

This commit is contained in:
Aleric Inglewood
2013-01-07 17:50:03 +01:00
9 changed files with 340 additions and 312 deletions

View File

@@ -46,4 +46,7 @@
name="post_btn"
bottom_delta="0"
width="100"/>
<string name="upload_message">
"Uploading..."
</string>
</floater>