Permalink
Browse files

Merge remote-tracking branch 'origin/v2.4_branch' into v2.5_branch

Conflicts:
	docs/man/man9/hostmot2.9
	src/emc/usr_intf/stepconf/stepconf.glade
  • Loading branch information...
2 parents 83d80b9 + d06e286 commit aa0d75f74a1c62f99210b02b4f42aef2c926a162 @jepler jepler committed Feb 26, 2012
Showing with 6 additions and 6 deletions.
  1. +4 −4 src/emc/usr_intf/stepconf/stepconf.glade
  2. +2 −2 src/emc/usr_intf/stepconf/stepconf.py
@@ -572,8 +572,8 @@ Parallel Port Settings' expanders.</property>
<widget class="GtkComboBox" id="pp2_direction">
<property name="visible">True</property>
<property name="sensitive">False</property>
- <property name="items" translatable="yes">In
-Out</property>
+ <property name="items" translatable="yes">Out
+In</property>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -588,8 +588,8 @@ Out</property>
<widget class="GtkComboBox" id="pp3_direction">
<property name="visible">True</property>
<property name="sensitive">False</property>
- <property name="items" translatable="yes">In
-Out</property>
+ <property name="items" translatable="yes">Out
+In</property>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -213,9 +213,9 @@ def __init__(self):
self.ioaddr = "0x378"
self.ioaddr2 = _("Enter Address")
- self.pp2_direction = 0 # input
+ self.pp2_direction = 0 # output
self.ioaddr3 = _("Enter Address")
- self.pp3_direction = 0 # input
+ self.pp3_direction = 0 # output
self.number_pports = 1
self.manualtoolchange = 1

0 comments on commit aa0d75f

Please sign in to comment.