Merge branch 'master' of https://github.com/SokoloffA/liblxqt into qt5
authorHong Jen Yee (PCMan) <pcman.tw@gmail.com>
Sat, 19 Apr 2014 12:02:45 +0000 (20:02 +0800)
committerHong Jen Yee (PCMan) <pcman.tw@gmail.com>
Sat, 19 Apr 2014 12:02:45 +0000 (20:02 +0800)
commit2d13fe1157343508501fbdb1d67a18b2f1a7b8a5
tree914ccb058468bfa2eebe2f275698d0da5b7dd5cf
parent656043dc9c919cb230850756a99fcf626a809fad
parent371400de54672a3fcfa96a0adb69ed518219f57c
Merge branch 'master' of https://github.com/SokoloffA/liblxqt into qt5

Conflicts:
CMakeLists.txt
cmake/create_pkgconfig_file.cmake
cmake/lxqt-config.cmake.in
lxqtapplication.h
lxqtautostartentry.h
18 files changed:
CMakeLists.txt
aboutdialog/technicalinfo.cpp
addplugindialog/lxqtaddplugindialog.cpp
cmake/lxqt-config.cmake.in
cmake/lxqt_use.cmake.in
configdialog/lxqtconfigdialog.cpp
lxqtapplication.cpp
lxqtapplication.h
lxqtautostartentry.cpp
lxqtautostartentry.h
lxqtnotification.cpp
lxqtnotification.h
lxqtplugininfo.h
lxqtpowermanager.cpp
lxqtscreensaver.cpp
lxqtsettings.cpp
lxqtxfitman.cpp
translatorsinfo/translatorsinfo.cpp