Merge branch 'newdocs'
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Tue, 20 Nov 2012 09:34:55 +0000 (10:34 +0100)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Tue, 20 Nov 2012 09:35:29 +0000 (10:35 +0100)
commit76a198807fd8dbaabdf5d5638e9ce5a589292535
tree0ecd83c68d3ecaf138c3ed7e37652ddca6f83a76
parent83f67b09c1b2b994d1252c4494d51072d2c51435
parent022b31497b02e516ec35ac7652352d79f244cc16
Merge branch 'newdocs'

Conflicts:
src/assistant/assistant/assistant.pro

Change-Id: If300627e2fef069274dec7785232ca144f3dfa28
src/assistant/assistant/assistant.pro