diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 17:07:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 17:07:50 +0200 |
| commit | 1675a0d726e5c07c275c0981cc3deb5ffbcc6afc (patch) | |
| tree | 6562b221705fe93308d2f3f6bda00993dbfe025f /.gitignore | |
| parent | 4cde1ade4321023ab0ec6f1a136595bba516e0ed (diff) | |
| parent | 987091c07bd4aa86296357f3cdad399a5be1c3b5 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: I2ef61b92b9448a1227620eba9d93de8b3208ca99
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -9,8 +9,10 @@ config.tests/libmodbus_byteswap/libmodbus_byteswap config.tests/libmodbus_tiocmrts/libmodbus_tiocmrts config.tests/libmodbus_strlcpy/libmodbus_strlcpy config.tests/libmodbus_rs485/libmodbus_rs485 +config.tests/language/language config.tests/socketcan/socketcan config.tests/socketcan_fd/socketcan_fd +examples/serialbus/modbus/adueditor/adueditor examples/serialbus/modbus/master/modbusmaster examples/serialbus/modbus/slave/modbusslave *.moc @@ -34,6 +36,7 @@ tests/auto/qmodbusserver/tst_qmodbusserver *.exe *.ipch *_wrapper.bat +*_wrapper.sh # Visual Studio generated files *.ib_pdb_index |