48577b2e7f
Conflicts: src/plugins/sqldrivers/psql/qsql_psql.cpp Change-Id: I070b455078b41e75c46562fcea5676d6218cd00c |
||
---|---|---|
.. | ||
kernel | ||
models | ||
sql.pro |
48577b2e7f
Conflicts: src/plugins/sqldrivers/psql/qsql_psql.cpp Change-Id: I070b455078b41e75c46562fcea5676d6218cd00c |
||
---|---|---|
.. | ||
kernel | ||
models | ||
sql.pro |