Git commit e28f518114d386f20706b650cb4392a884e3c84e by Albert Astals Cid.
Committed on 18/08/2015 at 14:43.
Pushed by aacid into branch 'master'.
Merge remote-tracking branch 'origin/Applications/15.08'
Conflicts:
addons/pate/src/plugins/cmake_utils/katepate_cmake_utils.desktop
addons/pate/src/plugins/katepate_commentar.desktop
doc/kate/man-kate.1.docbook
doc/katepart/menus.docbook
M +1 -1 CMakeLists.txt
M +1 -1 doc/katepart/menus.docbook
http://commits.kde.org/kate/e28f518114d386f20706b650cb4392a884e3c84e
diff --cc doc/katepart/menus.docbook
index 05ef550,0e22fe2..a2ecd7c
--- a/doc/katepart/menus.docbook
+++ b/doc/katepart/menus.docbook
@@@ -1638,4 -1639,4 +1638,4 @@@ documentation</ulink>.</para
&help.menu.documentation;
</sect1>
--</chapter>
++</chapter>
_______________________________________________
kde-doc-english mailing list
kde-doc-english@kde.org
https://mail.kde.org/mailman/listinfo/kde-doc-english
