Commit 3922be1b authored by con's avatar con
Browse files

Merge remote branch 'origin/2.0'

Conflicts:
	src/plugins/texteditor/texteditoractionhandler.cpp
parents 17fd33bd 626221b6
......@@ -34,6 +34,8 @@ Editing
* Fixed auto indent for C style coments
* Copying text from the editor now supports HTML mime type, preserving
the syntax highlighting.
* Block selection defines a find & replace scope
* Added customizable default file encoding (in addition to the project setting)
CodePaster
* Implemented new protocol of pastebin.com including list functionality
......
doc/images/qtcreator-build-issues.png

57.2 KB | W: | H:

doc/images/qtcreator-build-issues.png

21.3 KB | W: | H:

doc/images/qtcreator-build-issues.png
doc/images/qtcreator-build-issues.png
doc/images/qtcreator-build-issues.png
doc/images/qtcreator-build-issues.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-pprunsettings.png

58.8 KB | W: | H:

doc/images/qtcreator-pprunsettings.png

58.1 KB | W: | H:

doc/images/qtcreator-pprunsettings.png
doc/images/qtcreator-pprunsettings.png
doc/images/qtcreator-pprunsettings.png
doc/images/qtcreator-pprunsettings.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-search-pane.png

44.9 KB | W: | H:

doc/images/qtcreator-search-pane.png

22.2 KB | W: | H:

doc/images/qtcreator-search-pane.png
doc/images/qtcreator-search-pane.png
doc/images/qtcreator-search-pane.png
doc/images/qtcreator-search-pane.png
  • 2-up
  • Swipe
  • Onion skin
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment