Mark Riddoch 63252e94f2 Merge branch 'release-1.0beta-refresh' into blr ...

Fix conflict and remove some redundant code

Conflicts:
	server/core/poll.c

2014-09-24 16:49:12 +01:00

..

filter

Added variables for RabbitMQ headers and libraries, added more error checks.

2014-09-22 13:14:53 +03:00

include

Merge branch 'release-1.0beta-refresh' into blr

2014-09-24 16:49:12 +01:00

monitor

Merge branch 'release-1.0beta-refresh' into cmake_build

2014-09-24 12:59:47 +03:00

protocol

Merge branch 'release-1.0beta-refresh' into blr

2014-09-24 16:49:12 +01:00

routing

Merge branch 'release-1.0beta-refresh' into blr

2014-09-24 16:49:12 +01:00

CMakeLists.txt

initial implementation of the CMake build system

2014-09-11 18:24:41 +03:00