From: Carl Hetherington <cth@carlh.net>
Date: Mon, 14 Oct 2013 16:50:25 +0000 (+0100)
Subject: Merge branch '1.0' of ssh://carlh.dyndns.org/home/carl/git/dvdomatic into 1.0
X-Git-Tag: v2.0.48~1283
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=877227c50d5f48f0de5d64352d11afc2e0db696f

Merge branch '1.0' of ssh://carlh.dyndns.org/home/carl/git/dvdomatic into 1.0
---

877227c50d5f48f0de5d64352d11afc2e0db696f
diff --cc ChangeLog
index f7532998c,7cd3c67e5..59c424252
--- a/ChangeLog
+++ b/ChangeLog
@@@ -11,8 -6,10 +11,10 @@@
  
  	* Add some missing libraries to the OS X build.
  
+ 	* Fix libltdl search path on OS X.
+ 
  2013-10-12  Carl Hetherington  <cth@carlh.net>
 -	
 +
  	* Version 1.13 released.
  
  2013-10-12  Carl Hetherington  <cth@carlh.net>