diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-05 18:52:38 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-05 18:52:38 +0100 |
| commit | f6dbdd9c16166f345fd5743886229192c97c2c4f (patch) | |
| tree | 05e5e7b806dd627be4e3ba6fc9a32f115847acb0 /examples/sql/doc/images/books-demo.png | |
| parent | b8084618545570a8832d344a2e9586e1226cc697 (diff) | |
| parent | 47efa9213d92a4366e03bd6d056837cd5bbadb1e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/sql/drivers/sqlite/qsql_sqlite.cpp
Change-Id: Ia7cffd2c99ae3d5eea6b5740683c06e921336dcd
Diffstat (limited to 'examples/sql/doc/images/books-demo.png')
| -rw-r--r-- | examples/sql/doc/images/books-demo.png | bin | 0 -> 29155 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/examples/sql/doc/images/books-demo.png b/examples/sql/doc/images/books-demo.png Binary files differnew file mode 100644 index 0000000000..5bcc20b478 --- /dev/null +++ b/examples/sql/doc/images/books-demo.png |