From b529311418dfed6468d1b5419a98fac06dda2ea0 Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Jul 30 2010 14:23:27 +0000 Subject: Merge remote branch 'origin/master' into f13/master Conflicts: .gitignore googlecl.spec sources --- diff --git a/.gitignore b/.gitignore index 4fa4093..d283c6e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -googlecl-0.9.8.tar.gz +googlecl-0.9.9.tar.gz diff --git a/googlecl.spec b/googlecl.spec index da0318a..b3d8e81 100644 --- a/googlecl.spec +++ b/googlecl.spec @@ -4,7 +4,7 @@ %endif Name: googlecl -Version: 0.9.8 +Version: 0.9.9 Release: 1%{?dist} Summary: Command line tools for the Google Data APIs @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 29 2010 Adam Goode - 0.9.9-1 +- New upstream release, see http://code.google.com/p/googlecl/source/browse/trunk/changelog + * Sun Jul 11 2010 Adam Goode - 0.9.8-1 - New upstream release, see http://code.google.com/p/googlecl/source/browse/trunk/changelog diff --git a/sources b/sources index 389348d..244c8a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a0256d8cdb1b4147b579cb3c4cf1ac77 googlecl-0.9.8.tar.gz +0297341720b36e8accc07534e8d608b0 googlecl-0.9.9.tar.gz