summaryrefslogtreecommitdiffstats
path: root/gui/ConsoleWindow.ui
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-12-08 17:39:32 +0100
committerPetr Mrázek <peterix@gmail.com>2013-12-08 17:39:32 +0100
commitd68f49ffc0e4b39ed842032a1e365870d2597adf (patch)
tree7befe15e9cd0ae9fede0f2d883a1f4f789ee3959 /gui/ConsoleWindow.ui
parent0cb8ff40b26401a707781c2c4171d3ec6c114077 (diff)
parentc6f0d9ce937349aaab0ed7ee3968c73bf721665c (diff)
downloadMultiMC-d68f49ffc0e4b39ed842032a1e365870d2597adf.tar
MultiMC-d68f49ffc0e4b39ed842032a1e365870d2597adf.tar.gz
MultiMC-d68f49ffc0e4b39ed842032a1e365870d2597adf.tar.lz
MultiMC-d68f49ffc0e4b39ed842032a1e365870d2597adf.tar.xz
MultiMC-d68f49ffc0e4b39ed842032a1e365870d2597adf.zip
Merge branch 'feature_pasting' of https://github.com/robotbrain/MultiMC5 into develop
Diffstat (limited to 'gui/ConsoleWindow.ui')
-rw-r--r--gui/ConsoleWindow.ui7
1 files changed, 7 insertions, 0 deletions
diff --git a/gui/ConsoleWindow.ui b/gui/ConsoleWindow.ui
index ed1b627b..6cb5e93b 100644
--- a/gui/ConsoleWindow.ui
+++ b/gui/ConsoleWindow.ui
@@ -74,6 +74,13 @@
</property>
</widget>
</item>
+ <item>
+ <widget class="QPushButton" name="btnPaste">
+ <property name="text">
+ <string>Upload Log</string>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
</layout>