Merge master; fix destruction of Server; some test cleanups.
authorCarl Hetherington <cth@carlh.net>
Thu, 19 Jun 2014 23:53:40 +0000 (00:53 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 19 Jun 2014 23:53:40 +0000 (00:53 +0100)
commit0da7c88a1afb221f97e2e96c159b1a984e4e2f71
tree558590d5ad0a2ced262c2142915b738d898ddbf0
parent4a677ee9e750efc330c29df69f19dae27f09aa4d
parentda38ed791a5a46a97b26947409cf837b7939fd54
Merge master; fix destruction of Server; some test cleanups.
13 files changed:
ChangeLog
src/lib/config.h
src/lib/encoder.h
src/lib/image_content.cc
src/lib/server.cc
src/lib/server.h
src/wx/about_dialog.cc
src/wx/audio_mapping_view.cc
src/wx/config_dialog.cc
test/client_server_test.cc
test/player_test.cc
test/recover_test.cc
test/test.cc