Andrew Hutchings e3fe883a9c Fix merge issues

2019-05-14 14:18:11 +01:00

..

activestatementcounter.cpp

Reformat all code to coding standard

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

activestatementcounter.h

Reformat all code to coding standard

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

CMakeLists.txt

Permit build with older cmake

2019-05-08 20:14:45 -05:00

ExeMgr.rc

the begginning

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

exemgr.vpj

delete visual c++ project files. cmake can generate these if needed

2019-04-25 23:35:03 -05:00

ExeMgr.vpj

add back in windows project files

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

femsghandler.cpp

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

2018-02-02 14:53:36 +00:00

femsghandler.h

Reformat all code to coding standard

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

main.cpp

Fix merge issues

2019-05-14 14:18:11 +01:00

resource.h

Reformat all code to coding standard

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