Merge branch 'master' of git.kde.org:kate
author Pablo Martín
()
committer Pablo Martín
()
commit 4e10de5664fae5b41b4676caa2e27dcc26630959
tree 5c4a6d6a220658d97771c28c7a8431ead30106a2
parent dc65489bde1d322128416c3d8b4152fa338fd44e
parent ced8d9ec2977480dc199695b828296b4ded5e1f3
Merge branch 'master' of git.kde.org:kate
64 files changed:
kate/plugins/search/plugin_search.cpp
part/CMakeLists.txt
part/buffer/katetextblock.cpp
part/buffer/katetextfolding.cpp [ new file with mode 0644 ]
part/buffer/katetextfolding.h [ new file with mode 0644 ]
part/buffer/katetextline.cpp
part/buffer/katetextline.h
part/completion/katecompletiondelegate.cpp
part/dialogs/bordersappearanceconfigwidget.ui
part/document/katebuffer.cpp
part/document/katebuffer.h
part/document/katedocument.cpp
part/document/katedocument.h
part/kte5/foldinginterface.h [ new file with mode 0644 ]
part/render/katelayoutcache.cpp
part/render/katelinelayout.cpp
part/render/katelinelayout.h
part/render/katerenderer.cpp
part/render/katerenderer.h
part/syntax/data/c.xml
part/syntax/data/cmake.xml
part/syntax/data/python.xml
part/syntax/katecodefolding.cpp [ deleted file ]
part/syntax/katecodefolding.h [ deleted file ]
part/syntax/katehighlight.cpp
part/syntax/katehighlight.h
part/syntax/katehighlighthelpers.cpp
part/tests/CMakeLists.txt
part/tests/bug213964.cpp [ deleted file ]
part/tests/bug213964.h [ deleted file ]
part/tests/bug294241.cpp [ deleted file ]
part/tests/bug294241.h [ deleted file ]
part/tests/bug294750.cpp [ deleted file ]
part/tests/bug294750.h [ deleted file ]
part/tests/bug294756.cpp [ deleted file ]
part/tests/bug294756.h [ deleted file ]
part/tests/bug309093.cpp [ deleted file ]
part/tests/bug309093.h [ deleted file ]
part/tests/data/bug294241.php [ deleted file ]
part/tests/data/bug294241.rb [ deleted file ]
part/tests/data/bug294241.xml [ deleted file ]
part/tests/data/bug311866.cpp [ deleted file ]
part/tests/data/folding-crash.py [ deleted file ]
part/tests/data/md5checksum.txt [ moved from part/tests/data/bug309093.cpp with 100%% similarity ]
part/tests/foldedselection_test.cpp [ deleted file ]
part/tests/foldedselection_test.h [ deleted file ]
part/tests/katedocument_test.cpp
part/tests/katefolding_test.cpp [ deleted file ]
part/tests/katefolding_test.h [ deleted file ]
part/tests/katetextbuffertest.cpp
part/tests/katetextbuffertest.h
part/tests/kateview_test.cpp
part/tests/kte_documentcursor.cpp
part/tests/vimode_test.cpp
part/utils/katecmds.cpp
part/utils/kateprinter.cpp
part/view/kateview.cpp
part/view/kateview.h
part/view/kateviewhelpers.cpp
part/view/kateviewhelpers.h
part/view/kateviewinternal.cpp
part/view/kateviewinternal.h
part/vimode/kateviinsertmode.cpp
part/vimode/katevinormalmode.cpp