[devel] kdenonbeta/kdedebian/kalternatives/src
Mario Bensi <[email protected]> Fri, 1 Oct 2004 17:01:42 +0200 (CEST)
| Newsgroups | gmane.comp.kde.devel.debian |
|---|---|
| Message-ID | <20041001150142.98EE9126E1__21639.907701365$1096642962$gmane$org@office.kde.org> |
CVS commit by bensi:
correcting of bug
M +0 -33 addalternativesui.ui 1.7
--- kdenonbeta/kdedebian/kalternatives/src/addalternativesui.ui #1.6:1.7
@@ -14,9 +14,5 @@
</property>
<property name="caption">
-<<<<<<< addalternativesui.ui
<string>Add a Alternative</string>
-=======
- <string>Add Alternatives</string>
->>>>>>> 1.4
</property>
<grid>
@@ -139,33 +135,4 @@
<bool>true</bool>
</property>
-<<<<<<< addalternativesui.ui
-=======
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel1_2</cstring>
- </property>
- <property name="text">
- <string>Man Page:</string>
- </property>
- </widget>
- <widget class="KLineEdit">
- <property name="name">
- <cstring>m_PathMan</cstring>
- </property>
- </widget>
- <widget class="KPushButton">
- <property name="name">
- <cstring>m_bBrowseMan</cstring>
- </property>
- <property name="text">
- <string>Browse</string>
- </property>
- </widget>
- </hbox>
->>>>>>> 1.4
</widget>
<widget class="QLayoutWidget">