f4d8cafc1b
Conflicts: src/3rdparty/harfbuzz-ng/src/hb-private.hh src/sql/doc/snippets/code/doc_src_sql-driver.cpp src/sql/doc/src/sql-driver.qdoc Change-Id: I38f0e82fcd37926cbf3c1915e009a731040d4598 |
||
---|---|---|
.. | ||
Info.plist.app | ||
Info.plist.dSYM.in | ||
Info.plist.lib | ||
qmake.conf | ||
qplatformdefs.h |