Merge branch 'master' of gitorious.org:supplement/birdfont

Changed files (3)

• modified birdfont/GtkWindow.vala
• modified libbirdfont/Path.vala
• modified mac/create_dmg.py

Diff

diff --git a/birdfont/GtkWindow.vala b/birdfont/GtkWindow.valaindex 6d0cfcc..b028a36 100644--- a/birdfont/GtkWindow.vala+++ b/birdfont/GtkWindow.vala@@ -1,5 +1,5 @@ /*-    Copyright (C) 2012 Johan Mattsson+    Copyright (C) 2012, 2013 Johan Mattsson      This program is free software: you can redistribute it and/or modify     it under the terms of the GNU General Public License as published bydiff --git a/libbirdfont/Path.vala b/libbirdfont/Path.valaindex ce42c63..c0103d6 100644--- a/libbirdfont/Path.vala+++ b/libbirdfont/Path.vala@@ -1,5 +1,5 @@ /*-    Copyright (C) 2012 Johan Mattsson+    Copyright (C) 2012, 2013 Johan Mattsson      This program is free software: you can redistribute it and/or modify     it under the terms of the GNU General Public License as published bydiff --git a/mac/create_dmg.py b/mac/create_dmg.pyindex fe90807..f86dd25 100755--- a/mac/create_dmg.py+++ b/mac/create_dmg.py@@ -5,7 +5,7 @@ import shutil import subprocess import sys -sys.path.append('../')+sys.path.append('./') import version  def run(cmd):@@ -16,8 +16,8 @@ def run(cmd): 		exit(1) 		 def create_dmg ():-	run("rm -rf build/mac/birdfont-" + VERSION + ".dmg")	-	run("hdiutil create -megabytes 55 -fs HFS+ -volname birdfont build/mac/birdfont-" + VERSION)+	run("rm -rf build/mac/birdfont-" + version.VERSION + ".dmg")	+	run("hdiutil create -megabytes 55 -fs HFS+ -volname birdfont build/mac/birdfont-" + version.VERSION) 	# run("cp -r build/mac/birdfont.app /Volumes/birdfont/") 	print ("Copy the files with Finder, we don't know the path here.")