Frederik Gladhorn 190fa97c83 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: examples/widgets/doc/src/addressbook-fr.qdoc Change-Id: Id1196e8e0c6445f1616c3f29234c974d809f8e48		2013-08-27 22:51:09 +02:00
..
images	Doc: Fixed qmake manual's images and snippets directories.	2013-08-13 01:38:54 +02:00
snippets	Merge remote-tracking branch 'origin/stable' into dev	2013-08-27 22:51:09 +02:00
src	Merge remote-tracking branch 'origin/stable' into dev	2013-08-27 22:51:09 +02:00
qmake.qdocconf	Merge remote-tracking branch 'origin/stable' into dev	2013-08-14 09:06:31 +02:00