Markus Mäkelä c82831cc10 Fix merge conflict ...

An old define name caused the build to fail.

2017-02-08 09:29:26 +02:00

..

core

Merge branch '2.0' into 2.1.0

2017-02-08 09:27:00 +02:00

inih

Remove old .gitignore files

2016-11-28 14:37:26 +02:00

modules

Fix merge conflict

2017-02-08 09:29:26 +02:00

test

Remove old .gitignore files

2016-11-28 14:37:26 +02:00

CMakeLists.txt

Fix devel package

2017-01-16 10:56:33 +02:00

maxscale_binlogserver_template.cnf

All changes 1.4.3...2.0.0

2016-08-11 12:44:07 +03:00

maxscale.cnf.template

All changes 2.0.0...develop

2016-08-17 10:06:35 +03:00