FIx up some merge problems that slipped through the last commit. I

should be slapped for that.
This commit is contained in:
Collin Kidder
2015-12-20 21:41:38 -05:00
parent 8fa55dbdbf
commit a37dbe33aa
3 changed files with 2 additions and 7 deletions
+2
View File
@@ -355,6 +355,8 @@
<action name="actionConnect">
<property name="text">
<string>Connect</string>
</property>
</action>
<action name="actionScripting_INterface">
<property name="text">
<string>Scripting Interface</string>