Mark Riddoch a16f900d6d Merge branch 'hholzgra-hartmut-compile-warnings' into release-1.0beta-refresh ...

Conflicts:
	server/include/dcb.h

Resolved

2014-09-19 17:37:39 +01:00

..

test

Merge branch 'hholzgra-hartmut-gitignore' into release-1.0beta-refresh

2014-09-15 13:22:46 +01:00

log_manager.cc

Merge branch 'hholzgra-hartmut-compile-warnings' into release-1.0beta-refresh

2014-09-19 17:37:39 +01:00

log_manager.h

Merge branch 'hholzgra-hartmut-compile-warnings' into release-1.0beta-refresh

2014-09-19 17:37:39 +01:00

makefile

Removed the debug tags from log entries in standard debug builds and added a special switch to the tests

2014-09-10 13:00:28 +03:00