Merge branch 'review/roland_pallai/favtags'
commit8c300f482dd32c04888cf185fab29a08d7ffad29
authorJan Kundrát <jkt@kde.org>
Fri, 21 Apr 2017 19:29:26 +0000 (21 21:29 +0200)
committerJan Kundrát <jkt@kde.org>
Fri, 21 Apr 2017 19:29:54 +0000 (21 21:29 +0200)
tree8fdcf99fe02bf0a749d63813958c46e6bfc5f096
parent38b8822884868c35c6d768558a28788c7fddbbcb
parentd09a24fb964ff4a35a8a605c84a88a5c30ee4f55
Merge branch 'review/roland_pallai/favtags'

Change-Id: I782bb1a9a14db31058a88e7132ae4183474a244b
CMakeLists.txt
src/Gui/ComposeWidget.cpp
src/Gui/Window.cpp
src/Gui/Window.h