Fix merge.
authorCarl Hetherington <cth@carlh.net>
Tue, 12 Aug 2014 20:30:18 +0000 (21:30 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 12 Aug 2014 20:30:18 +0000 (21:30 +0100)
commit04acfa42cdffd5938358847ebee822399ef978e6
tree2159fd6e9ddddd1cd5a6c010d4dee3a4d99a17f8
parentcc27c2716f755305d67f1e1ba828ecf37f8405dd
Fix merge.
platform/osx/make_dmg.sh