Merge master.
authorCarl Hetherington <cth@carlh.net>
Sat, 10 May 2014 13:13:10 +0000 (14:13 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 10 May 2014 13:13:10 +0000 (14:13 +0100)
commitcfdd68eb5fb0ef8423e860103ad4e5510994f1da
tree9ea43b250723775329741e59d5bc2dd861bcb7be
parent1dcfb3a26085ebb3703f40e2f51e43ce3d98be50
parent5575a950f13dbed1e60d733aee71b316c3429ae0
Merge master.
ChangeLog
src/lib/audio_mapping.cc
src/lib/film.cc
src/lib/resampler.cc
src/lib/util.cc
src/lib/util.h
src/wx/audio_mapping_view.cc
src/wx/film_editor.cc
test/audio_mapping_test.cc
test/silence_padding_test.cc