Skip to content
GitLab
Explore
Sign in
Ashwin Dhakaita
Krita
Repository
krita
CMakeLists.txt
Find file
Blame
History
Permalink
Merge branch 'frameworks' of
git://anongit.kde.org/calligra
into frameworks
· e8b279f2
Sven Langkamp
authored
Mar 29, 2015
Conflicts: krita/ui/dialogs/kis_dlg_filter.cpp krita/ui/kis_aboutdata.cpp
e8b279f2