Diffusion KDb da6be37a8c2c

Merge remote-tracking branch 'origin/3.1'
da6be37a8c2c
Actions

Authored by staniek on Nov 25 2018, 9:47 PM.

Description

Merge remote-tracking branch 'origin/3.1'

  1. Conflicts:
  2. src/drivers/mysql/kdb_mysqldriver.json
  3. src/drivers/postgresql/kdb_postgresqldriver.json
  4. src/drivers/sqlite/kdb_sqlitedriver.json
  5. src/drivers/sybase/kdb_sybasedriver.json
  6. src/drivers/xbase/kdb_xbasedriver.json

Details

Committed
staniekNov 25 2018, 9:47 PM
Parents
R15:5f06f3f88f1b: GIT_SILENT Improve spacing for some QDebug operators
R15:8bb8df1f6993: SVN_SILENT made messages (.desktop file) - always resolve ours
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
5f06f3f88f1bstaniek
GIT_SILENT Improve spacing for some QDebug operators 
Nov 25 2018
2f0cd690fb46staniek
Fix typo in testBinaryExpressionValidate_data() for TIME_CONST 
Nov 25 2018
b627ae468453l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Oct 24 2018

Changes (5)

PathPackages
Mautotests/ExpressionsTest.cpp
Msrc/expression/KDbExpression.cpp
Msrc/parser/generate_parser_code.sh
Msrc/parser/generated/KDbToken.cpp
Msrc/parser/generated/KDbToken.h

R15:da6be37a8c2c

View Options

autotests/ExpressionsTest.cpp

Loading...
View Options

src/expression/KDbExpression.cpp

Loading...
View Options

src/parser/generate_parser_code.sh

Loading...
View Options

src/parser/generated/KDbToken.cpp

Loading...
View Options

src/parser/generated/KDbToken.h

Loading...