Andrew Hutchings 4764094e4a Fix merge errors

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

..

build

the begginning

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

bulk

Merge branch 'develop-1.1' into 1.1-merge-up-20180509-a2

2018-05-09 09:20:55 +01:00

client

Reformat all code to coding standard

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

dictionary

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

2017-12-12 20:26:00 +00:00

index

Reformat all code to coding standard

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

redistribute

Reformat all code to coding standard

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

server

MCOL-392 Add initial TIME datatype support

2018-04-30 09:42:41 +01:00

shared

MCOL-392 Fix cpimport and >8bit positive hour

2018-04-30 09:42:41 +01:00

splitter

Fix merge errors

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

wrapper

Fix code style

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

xml

MCOL-392 Add initial TIME datatype support

2018-04-30 09:42:41 +01:00

CMakeLists.txt

Add CMake build tree files

2016-07-15 10:49:57 -05:00

libwriteengine.rc

the begginning

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

libwriteengine.vcxproj

add back in windows project files

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

libwriteengine.vcxproj.filters

add back in windows project files

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

resource.h

Reformat all code to coding standard

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