[gnome-icon-theme-extras: 4/4] Merge branch 'f15'

[Tomas Bzatek]

commit 098f702cb2a329022145a994ce7de8eea46c02a4
Merge: a685efa 2fdd744
Author: Tomas Bzatek <tbzatek at redhat.com>
Date:   Thu Apr 21 16:24:21 2011 +0200

    Merge branch 'f15'
    
    Conflicts:
    	.gitignore
    	gnome-icon-theme-extras.spec
    	sources

 .gitignore                   |    4 +---
 gnome-icon-theme-extras.spec |   10 +++++-----
 sources                      |    3 +--
 3 files changed, 7 insertions(+), 10 deletions(-)
---
diff --cc .gitignore
index 2055de7,322d1c5..1833ac5
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,4 +1,1 @@@
--gnome-icon-theme-extras-2.30.1.tar.bz2
--git-extras-ipad.tar.bz2
--/gnome-icon-theme-extras-2.90.7.tar.bz2
+ /gnome-icon-theme-extras-3.0.0.tar.bz2