Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 20 May 2015 15:29:25 +0000 (16:29 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 20 May 2015 15:29:25 +0000 (16:29 +0100)
commit6f0a590bc3266f21ba577116219bd019e891d480
tree273721d852a9b90b541c8fcefd10d209e6ef2ce2
parentada329f77032590bae1e18d05a87f94c82e14a55
parentb433d33bcbfccf29171fe24c55fdee550a8c36aa
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
src/lib/server_finder.cc