Merge branch 'master' of birdfont.org/gitphp-glip/birdfont Conflicts: scripts/bavala.py

Changed files (1)

• modified scripts/bavala.py

Diff

diff --git a/scripts/bavala.py b/scripts/bavala.pyindex 9785d38..f2cbad3 100644--- a/scripts/bavala.py+++ b/scripts/bavala.py@@ -85,7 +85,11 @@ class Vala(object):             self.so_link = join(build, src) + '.so'             self.so_link_name = src + '.so'             self.so_version = so_version+<<<<<<< HEAD             self.so_name = 'lib' + library + '.so.' + so_version;+=======+            self.so_name = library + '.so.' + so_version;+>>>>>>> e8a3b18d3b7fd2193801a61a9d8b1d1c306dfd0c      def gen_c(self, opts):         """translate code from vala to C and create .vapi"""