More master merge bits.
authorCarl Hetherington <cth@carlh.net>
Tue, 2 Jul 2013 13:00:57 +0000 (14:00 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 2 Jul 2013 13:00:57 +0000 (14:00 +0100)
commit2e64e69c8d7836d14e059c474bb6bd667e7bb52f
treea5d2f2a33a56cffb55e8be02f895063edbdb736b
parent37a00950acd0df2796345005cf5a1973eeca1136
More master merge bits.
examples/make_dcp.cc
src/cpl.cc
src/cpl.h
src/util.cc
test/tests.cc