Mark Riddoch b764745fc3 Merge branch 'develop' into MAX-65 ...

Conflicts:
	server/core/config.c

2014-06-02 18:07:09 +01:00

..

.gitignore

Updated gitignore files

2014-02-05 14:49:05 +01:00

httpd.c

Addition of the module info structure to allow module information to

2014-06-02 17:10:05 +01:00

Makefile

moving files to /server to make merge possible

2013-07-28 05:31:11 +00:00

mysql_backend.c

Addition of the module info structure to allow module information to

2014-06-02 17:10:05 +01:00

mysql_client.c

Merge branch 'develop' into MAX-65

2014-06-02 18:07:09 +01:00

mysql_common.c

merge from branch 'cenh'

2014-05-26 12:15:34 +02:00

telnetd.c

Merge branch 'develop' into MAX-65

2014-06-02 18:07:09 +01:00