Commit bd16eeef authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge branch 'docs'

Conflicts:
	doc/qtcreator.qdoc
parents 14fc6e93 16f7ed26
doc/images/qtcreator-textfinder-ui.png

7.42 KB | W: | H:

doc/images/qtcreator-textfinder-ui.png

2.48 KB | W: | H:

doc/images/qtcreator-textfinder-ui.png
doc/images/qtcreator-textfinder-ui.png
doc/images/qtcreator-textfinder-ui.png
doc/images/qtcreator-textfinder-ui.png
  • 2-up
  • Swipe
  • Onion skin
This diff is collapsed.
......@@ -50,6 +50,8 @@ macro.ouml.HTML = "ö"
macro.QA = "\\e{Qt Assistant}"
macro.QD = "\\e{Qt Designer}"
macro.QL = "\\e{Qt Linguist}"
macro.QC = "\\e{Qt Creator}"
macro.QMLD = "\\e{QML Designer}"
macro.param = "\\e"
macro.raisedaster.HTML = "<sup>*</sup>"
macro.reg.HTML = "<sup>&reg;</sup>"
......
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