Merge branch 'topic/bernhard/input' into topic/bernhard/input-threads

Browse source

most stuff is inplace, logging framework needs a few changes merged before continuing here...

Conflicts:
	src/CMakeLists.txt
	src/LogMgr.h
	src/logging/Manager.cc
	src/main.cc

...

This commit is contained in:

Bernhard Amann 2012-02-06 10:54:07 -08:00

parent a0487ecb30 f24c50b49a

commit f6c6387c52

48 changed files with 3399 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

0

src/input/ReaderFrontend.h Normal file

Unescape Escape View file