Merge master.
authorCarl Hetherington <cth@carlh.net>
Tue, 9 Sep 2014 20:52:05 +0000 (21:52 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 9 Sep 2014 20:52:05 +0000 (21:52 +0100)
commit39029279954b1f346d3ba28ec12c58211bfa7436
treec225a1fbcb4f5af7866d3eee8970cd500129a54d
parent0c3155bda8935bf597535f4e38f65568e55093eb
parent087eb941421d0ced97c8f3bf72072f19562435df
Merge master.
ChangeLog
src/lib/magick_image_proxy.cc
src/wx/about_dialog.cc
wscript