fix oo bindings

git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@437 b9cfdab3-6d41-4d17-bbe4-086880011989

tools/genoo.pl

@@ -56,7 +56,7 @@ foreach my $f (@files) {
             @props = split(/[ \t]+/, $1);
         }
         elsif ($l =~
-/^MWDECL[ \t]+(.+)[ \t]+Mw${name}([^ \t]+)[ \t]*\([^,\)]+(?:,(.*))?\);(?: \/\*(.+))?$/
+/^(?:MWDECL|MwInline)[ \t]+(.+)[ \t]+Mw${name}([^ \t]+)[ \t]*\([^,\)]+(?:,(.*))?\)(?:;|[ \t]+\{)(?: \/\*(.+))?$/
           )
         {
             my $arg = $3;

tools/git_merge.sh

@@ -1,3 +1,6 @@
+#!/usr/bin/env bash
+# $Id$
+
 if [[ $1 -eq "" ]]; then
     echo "Blank argument."
     exit