[vlc-devel] [vlc-commits] commit: Qt: simple_prefs pack UI (Francois Cartegnie )

[xxcv]

On 30/07/2010 3:28 AM, git at videolan.org wrote:
> vlc | branch: master | Francois Cartegnie<fcvlcdev at free.fr>  | Thu Jul 29 19:27:12 2010 +0200| [9d99a7ab7450ddb180d26f9677d7e95a748a361c] | committer: Francois Cartegnie
>
> Qt: simple_prefs pack UI
>
>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9d99a7ab7450ddb180d26f9677d7e95a748a361c
> ---
>
>   modules/gui/qt4/components/simple_preferences.cpp |   15 +-
>   modules/gui/qt4/components/simple_preferences.hpp |    1 +
>   modules/gui/qt4/ui/sprefs_interface.ui            |  676 +++++++++++++--------
>   3 files changed, 422 insertions(+), 270 deletions(-)
>
> Diff:   http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=9d99a7ab7450ddb180d26f9677d7e95a748a361c
Hmm, how come there's some conflicts..?

remote: Counting objects: 133, done.
remote: Compressing objects: 100% (97/97), done.
remote: Total 97 (delta 81), reused 0 (delta 0)
Unpacking objects: 100% (97/97), done.
 From git://git.videolan.org/vlc
  + 6e88ccc...db6104c master     -> origin/master  (forced update)
Auto-merging NEWS
Auto-merging modules/gui/qt4/ui/sout.ui
CONFLICT (content): Merge conflict in modules/gui/qt4/ui/sout.ui
Automatic merge failed; fix conflicts and then commit the result.

diff --cc modules/gui/qt4/ui/sout.ui
index 0f8360b,88c075d..0000000
--- a/modules/gui/qt4/ui/sout.ui
+++ b/modules/gui/qt4/ui/sout.ui
@@@ -280,7 -280,7 +280,11 @@@
          </rect>
         </property>
         <attribute name="label">
++<<<<<<< HEAD
  +       <string>Options Setup</string>
++=======
+        <string>Option Setup</string>
++>>>>>>> db6104c7f94c9da5a3dbcfcda5a03757d32d51fa
         </attribute>
         <layout class="QGridLayout" name="gridLayout_2">
          <item row="0" column="0" colspan="2">