Merge branch 'master' into develop
author Julia Mineeva
()
committer Julia Mineeva
()
commit a77171b5a71941b8a4e43a845e0825a4cabc965a
tree 6595d832200266b258e88145b2d79ad910ea520d
parent 744b6c62da5ce317f89ca1cfe9739ec081f5b663
parent c0010ccdfa25a733f6746b0d17605603e4dd6757
Merge branch 'master' into develop

Conflicts:
src/declarativeviewer.cpp
CMakeLists.txt
klook.spec
locale/ru/KLook.po
src/declarativeviewer.cpp
src/declarativeviewer.h
src/klookapp.cpp
src/klookapp.h
src/main.cpp
src/qml/main.qml