Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0

4 files changed, 14 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index af1878ba2..7a046e6c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-07  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.26 released.
+
 2015-01-04  Carl Hetherington  <cth@carlh.net>
 
 	* Fix loading of SMPTE XML subtitles which
diff --git a/debian/changelog b/debian/changelog
index 5e712621f..9f261785c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.0.25-1) UNRELEASED; urgency=low
+dcpomatic (2.0.26-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -204,8 +204,9 @@ dcpomatic (2.0.25-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sun, 14 Dec 2014 17:09:05 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 07 Jan 2015 00:26:29 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/src/lib/font.h b/src/lib/font.h
index 6161c20a9..7009555c4 100644
--- a/src/lib/font.h
+++ b/src/lib/font.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,6 +17,9 @@
 
 */
 
+#ifndef DCPOMATIC_FONT_H
+#define DCPOMATIC_FONT_H
+
 #include <libcxml/cxml.h>
 #include <boost/optional.hpp>
 #include <boost/filesystem.hpp>
@@ -39,3 +42,5 @@ public:
 
 bool
 operator!= (Font const & a, Font const & b);
+
+#endif
diff --git a/wscript b/wscript
index 1ec7db172..984a0e048 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@ import distutils
 import distutils.spawn
 
 APPNAME = 'dcpomatic'
-VERSION = '2.0.25devel'
+VERSION = '2.0.26devel'
 
 def options(opt):
     opt.load('compiler_cxx')