[tango/f14/master] Update to new release

[MERCIER Jonathan]

commit 2fa1e761781f2e50d534eac3a3d5629d781f6ff0
Author: bioinfornatics <bioinfornatics at fedoraproject.org>
Date:   Wed Oct 13 19:49:26 2010 +0200

    Update to new release
    
    Conflicts:
    
    	.gitignore
    	sources
    	tango.spec

 .gitignore |    4 ++++
 sources    |    4 ++++
 tango.spec |   18 +++++++++++++++++-
 3 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 67f61b8..21ec59c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,8 @@ tango-20100802svn5517.tar.xz
 ldc-20100609hg1654.tar.xz
 /tango-20100826svn5543.tar.xz
 /tango-20100919svn5561.tar.xz
+<<<<<<< HEAD
 /tango-20100928svn5567.tar.xz
+=======
+/tango-20101012svn5569.tar.xz
+>>>>>>> 59376cc... Update to new release
diff --git a/sources b/sources
index afaf2a7..f4e73b8 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
+<<<<<<< HEAD
 36d74b43a1ad737d2423fb7c987bb46b  tango-20100928svn5567.tar.xz
+=======
+9b7ec01de018620c5b8b68ec8e543bd8  tango-20101012svn5569.tar.xz
+>>>>>>> 59376cc... Update to new release
diff --git a/tango.spec b/tango.spec
index 1ca39c3..bde4aba 100644
--- a/tango.spec
+++ b/tango.spec
@@ -1,15 +1,25 @@
+<<<<<<< HEAD
 %global     alphatag        20100928
 %global     svn_revision    svn5567
+=======
+%global     alphatag        20101012
+%global     svn_revision    svn5569
+>>>>>>> 59376cc... Update to new release
 %global     debug_package   %{nil}
 
 # The source for this package was pulled from upstream's subversion (svn).
 # Use the following commands to generate the tarball:
+<<<<<<< HEAD
 # svn export -r 5567 http://svn.dsource.org/projects/tango/trunk tango-20100928svn5567
 # tar -cJvf tango-20100928svn5567.tar.xz tango-20100928svn5567
+=======
+# svn export -r 5569 http://svn.dsource.org/projects/tango/trunk tango-20101012svn5569
+# tar -cJvf tango-20101012svn5569.tar.xz tango-20101012svn5569
+>>>>>>> 59376cc... Update to new release
 
 Name:           tango
 Version:        0.99.9
-Release:        20.%{alphatag}%{svn_revision}%{?dist}
+Release:        21.%{alphatag}%{svn_revision}%{?dist}
 Summary:        The Developer's Library for D
 
 Group:          Development/Libraries
@@ -153,6 +163,12 @@ rm -rf %{buildroot}
 %doc doc/example
 
 %changelog
+<<<<<<< HEAD
+=======
+* Wed Oct 13 2010  Jonathan MERCIER <bioinfornatics at gmail.com>  0.99.9-21.20101012svn5569
+- Update to revision 5569
+
+>>>>>>> 59376cc... Update to new release
 * Tue Sep 28 2010 Jonathan MERCIER <bioinfornatics at gmail.com>  0.99.9-20.20100928svn5567
 - Update to revision 5567