ooo-build r13127 - in trunk: . bin

[jannieuw svn gnome org]

Author: jannieuw
Date: Wed Jul  9 19:41:52 2008
New Revision: 13127
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13127&view=rev

Log:
2008-07-09  Jan Nieuwenhuizen  <janneke gnu org>

	* bin/git-merge-gob: Rename from bin/git-merge-bases.
	* bin/gob-update: Update.


Added:
   trunk/bin/git-merge-gob   (props changed)
      - copied unchanged from r13115, /trunk/bin/git-merge-bases
Removed:
   trunk/bin/git-merge-bases
Modified:
   trunk/ChangeLog
   trunk/bin/gob-update

Modified: trunk/bin/gob-update
==============================================================================
--- trunk/bin/gob-update	(original)
+++ trunk/bin/gob-update	Wed Jul  9 19:41:52 2008
@@ -14,8 +14,12 @@
 gob_bases=$(git-tag | grep '^gob-')
 if test -z "$gob_bases"
 then
-    echo 'cannot find any gob-* tag, aborting'
-    exit 1
+	echo 'cannot find any gob-* tag, aborting'
+	exit 1
 fi
 
-git-merge-bases --bases="$gob_bases" $master_branch
+git-merge-gob --bases="$gob_bases" $master_branch
+
+# Local Variables:
+# sh-basic-offset:8
+# End: