Merge branch 'master' of git://anongit.kde.org/clones/kate/cullmann/kate-codefolding
author Christoph Cullmann
()
committer Christoph Cullmann
()
commit c9d6ceb1525465c4620919ce37cc54d64c260526
tree 27a79c2e8f47b76e0d7076025ab2573f23d6da9a
parent 10c60066adee5cf39778f9e2defea21d4f198ee6
parent a66b71ce3883a3375fac62c55fbdd3363fff4de6
Merge branch 'master' of git://anongit.kde.org/clones/kate/cullmann/kate-codefolding
35 files changed:
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/document/katebuffer.cpp
part/document/katebuffer.h
part/document/katedocument.cpp
part/document/katedocument.h
part/render/katelayoutcache.cpp
part/render/katelinelayout.cpp
part/render/katelinelayout.h
part/render/katerenderer.cpp
part/render/katerenderer.h
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/katetextbuffertest.cpp
part/tests/katetextbuffertest.h
part/tests/kateview_test.cpp
part/tests/kte_documentcursor.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/katevinormalmode.cpp