Andrew Hutchings 4764094e4a Fix merge errors

2018-05-31 15:04:04 +01:00

..

CMakeLists.txt

MCOL-879 Fix QueryStats linking issues

2017-08-18 10:16:52 +01:00

resource.h

Reformat all code to coding standard

2017-10-26 17:18:17 +01:00

splitter.rc

the begginning

2016-01-06 14:08:59 -06:00

splitter.vcxproj

add back in windows project files

2016-01-13 15:52:33 -06:00

splitter.vcxproj.filters

add back in windows project files

2016-01-13 15:52:33 -06:00

splitter.vpj

add back in windows project files

2016-01-13 15:52:33 -06:00

we_brmupdater.cpp

Reformat all code to coding standard

2017-10-26 17:18:17 +01:00

we_brmupdater.h

Reformat all code to coding standard

2017-10-26 17:18:17 +01:00

we_cmdargs.cpp

Reformat all code to coding standard

2017-10-26 17:18:17 +01:00

we_cmdargs.h

Fix merge errors

2018-05-31 15:04:04 +01:00

we_filereadthread.cpp

Fix code style

2018-05-31 14:44:48 +01:00

we_filereadthread.h

Fix code style

2018-05-31 14:44:48 +01:00

we_respreadthread.cpp

Reformat all code to coding standard

2017-10-26 17:18:17 +01:00

we_respreadthread.h

Reformat all code to coding standard

2017-10-26 17:18:17 +01:00

we_sdhandler.cpp

Merge branch 'develop-1.1' into 1.1-merge-up-20180531

2018-05-31 14:43:52 +01:00

we_sdhandler.h

Merge branch 'develop-1.1' into 1.1-merge-up-20180531

2018-05-31 14:43:52 +01:00

we_splclient.cpp

Reformat all code to coding standard

2017-10-26 17:18:17 +01:00

we_splclient.h

Reformat all code to coding standard

2017-10-26 17:18:17 +01:00

we_splitterapp.cpp

Merge branch 'develop-1.1' into dev-merge-up-20180430

2018-04-30 08:51:58 +01:00

we_splitterapp.h

Reformat all code to coding standard

2017-10-26 17:18:17 +01:00

we_tablelockgrabber.cpp

Reformat all code to coding standard

2017-10-26 17:18:17 +01:00

we_tablelockgrabber.h

Reformat all code to coding standard

2017-10-26 17:18:17 +01:00

we_xmlgetter.cpp

Reformat all code to coding standard

2017-10-26 17:18:17 +01:00

we_xmlgetter.h

Reformat all code to coding standard

2017-10-26 17:18:17 +01:00