Alexandru Croitor a1dbdcbd6e Merge remote-tracking branch 'origin/dev' into wip/cmake ... Conflicts: src/corelib/Qt5CoreConfigExtras.cmake.in src/corelib/Qt5CoreMacros.cmake src/dbus/Qt5DBusConfigExtras.cmake.in src/widgets/Qt5WidgetsConfigExtras.cmake.in Change-Id: Ib782f3b177c38b2cce83beebe15be9c0baa578f7		2020-01-29 16:57:27 +01:00
..
cbordump	Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake	2019-06-14 16:31:09 +02:00
convert	Merge remote-tracking branch 'origin/dev' into wip/cmake	2020-01-29 16:57:27 +01:00
savegame	Merge remote-tracking branch 'origin/dev' into merge-dev	2020-01-24 13:17:33 +01:00
CMakeLists.txt	CMake: Add more examples	2019-03-26 13:03:01 +00:00
serialization.pro	Examples: add an example that converts between different file formats	2018-07-04 03:03:47 +00:00