Branch: refs/heads/qt5
  Home:   https://github.com/licq-im/licq
  Commit: 10185bc0a31d5dc3d22023a2b77b3bb0b0c3c5cf
      
https://github.com/licq-im/licq/commit/10185bc0a31d5dc3d22023a2b77b3bb0b0c3c5cf
  Author: Anders Olofsson <fl...@licq.org>
  Date:   2014-10-04 (Sat, 04 Oct 2014)

  Changed paths:
    M forwarder/README
    M licq/bin/gnome-menu-install.sh
    M licq/doc/HINTS
    M licq/doc/PLUGINS.HOWTO
    M licq/doc/README
    M licq/src/licq.cpp
    M osd/src/licq-osd.cpp
    M qt-gui/CMakeLists.txt
    M qt-gui/doc/DOCKING.HOWTO
    M qt-gui/doc/DOCK_THEME.HOWTO
    M qt-gui/doc/INSTALL
    M qt-gui/doc/README
    M qt-gui/doc/README.KDE
    M qt-gui/doc/SKINS.HOWTO
    M qt-gui/doc/qt-gui.doxygen
    M qt-gui/po/CMakeLists.txt
    M qt-gui/po/README.LOCALE
    M qt-gui/src/CMakeLists.txt
    M qt-gui/src/core/factory.cpp
    M qt-gui/src/core/gui-defines.h
    M qt-gui/src/core/licqgui.cpp
    M qt-gui/src/core/plugin.cpp
    M rms/README
    M scripts/create-licq-tarball

  Log Message:
  -----------
  Rename plugin to qt-gui


  Commit: de722890a05fa11c66d7bd6536f6adb4d312872e
      
https://github.com/licq-im/licq/commit/de722890a05fa11c66d7bd6536f6adb4d312872e
  Author: Anders Olofsson <fl...@licq.org>
  Date:   2014-10-04 (Sat, 04 Oct 2014)

  Changed paths:
    M qt-gui/src/config/iconmanager.cpp
    M qt-gui/src/config/shortcuts.cpp
    M qt-gui/src/contactlist/contactlist.cpp
    M qt-gui/src/contactlist/contactuserdata.cpp
    M qt-gui/src/contactlist/mode2contactlistproxy.cpp
    M qt-gui/src/dialogs/forwarddlg.cpp
    M qt-gui/src/dialogs/gpgkeymanager.cpp
    M qt-gui/src/dialogs/gpgkeyselect.cpp
    M qt-gui/src/dockicons/defaultdockicon.cpp
    M qt-gui/src/helpers/support.cpp
    M qt-gui/src/settings/skin.cpp
    M qt-gui/src/userevents/usersendevent.cpp
    M qt-gui/src/userevents/userviewevent.cpp
    M qt-gui/src/views/mmuserview.cpp
    M qt-gui/src/views/userview.cpp
    M qt-gui/src/views/userviewbase.cpp
    M qt-gui/src/widgets/mlview.cpp

  Log Message:
  -----------
  qt-gui: Code cleanup to help Qt5 migration


  Commit: cd621ece9d271bccb12788057ea56e9a0736cf5b
      
https://github.com/licq-im/licq/commit/cd621ece9d271bccb12788057ea56e9a0736cf5b
  Author: Erik Johansson <er...@licq.org>
  Date:   2014-10-05 (Sun, 05 Oct 2014)

  Changed paths:
    M forwarder/README
    M licq/bin/gnome-menu-install.sh
    M licq/doc/HINTS
    M licq/doc/PLUGINS.HOWTO
    M licq/doc/README
    M licq/src/licq.cpp
    M osd/src/licq-osd.cpp
    M qt-gui/doc/DOCKING.HOWTO
    M qt-gui/doc/DOCK_THEME.HOWTO
    M qt-gui/doc/INSTALL
    M qt-gui/doc/README
    M qt-gui/doc/README.KDE
    M qt-gui/doc/SKINS.HOWTO
    M qt-gui/doc/qt-gui.doxygen
    M qt-gui/po/README.LOCALE
    M qt-gui/src/CMakeLists.txt
    M qt-gui/src/core/factory.cpp
    M qt-gui/src/core/gui-defines.h
    M qt-gui/src/core/licqgui.cpp
    M qt-gui/src/core/plugin.cpp
    M qt-gui/src/dialogs/gpgkeyselect.cpp
    M qt-gui/src/helpers/support.cpp
    M qt-gui/src/views/userviewbase.cpp
    M rms/README
    M scripts/create-licq-tarball

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into qt5

Conflicts:
        licq/src/licq.cpp
        qt-gui/CMakeLists.txt
        qt-gui/src/core/factory.cpp
        qt-gui/src/dialogs/gpgkeyselect.cpp


Compare: https://github.com/licq-im/licq/compare/6da9db0ed75f...cd621ece9d27

-- 

--- 
You received this message because you are subscribed to the Google Groups "Licq 
Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to licq-commits+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to