[valide/f14/master] New Revision

[MERCIER Jonathan]

commit 8aa9198324a4655730cab30f67d7b770b25cb383
Author: bioinfornatics <bioinfornatics at fedoraproject.org>
Date:   Fri Oct 8 23:17:16 2010 +0200

    New Revision

 .gitignore  |    1 +
 sources     |    4 ----
 valide.spec |   12 ++++--------
 3 files changed, 5 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6671617..b80196c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 valide-20101105svn609.tar.xz
 /valide-20100904svn689.tar.xz
 /valadoc.py
+/valide-20100923bzr557.tar.xz
diff --git a/sources b/sources
index 62b7875..049fb2d 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
-3693e1dc1db5e1c53975e61190adab98  valide-20100904svn689.tar.xz
-=======
 2ca942fa38b57175121333d350773ddd  valide-20100923bzr557.tar.xz
->>>>>>> d3533ce... New Revision
 b7e2a245a559bb4a841f593f6b80f11e  valadoc.py
diff --git a/valide.spec b/valide.spec
index ff62675..eddced5 100644
--- a/valide.spec
+++ b/valide.spec
@@ -1,20 +1,16 @@
-%global     alphatag        20100904
-%global     svn_revision    svn689
+%global     alphatag        20100923
+%global     svn_revision    bzr557
 %global     gtk2_version    2.18.0
 %global     vala_version    0.9.7
 
 # The source for this package was pulled from upstream's cvs.  Use the
 # following commands to generate the tarball:
-# svn export -r r689  http://valide.googlecode.com/svn/trunk/ valide-20100904svn689
-# tar -cJvf valide-20100904svn689.tar.xz valide-20100904svn689
+# bzr branch -r 557 lp:valide valide-20100923bzr557
+# tar -cJvf valide-20100923bzr557.tar.xz valide-20100923bzr557
 
 Name:           valide
 Version:        0.7.0
-<<<<<<< HEAD
-Release:        5.%{alphatag}%{svn_revision}%{?dist}
-=======
 Release:        7.%{alphatag}%{svn_revision}%{?dist}
->>>>>>> d3533ce... New Revision
 Summary:        An integrated development environment (IDE) for the Vala programming language
 
 Group:          Development/Tools