[gmixer/f15/master: 8/8] Merge branch 'f15/master' of ssh://pkgs.fedoraproject.org/gmixer into f15

[Adam Williamson]

commit ec44833802e519dc46c04441e4b51572a4a28141
Merge: 236c540 2f489e7
Author: Adam Williamson <awilliam at redhat.com>
Date:   Mon Mar 28 17:33:37 2011 -0700

    Merge branch 'f15/master' of ssh://pkgs.fedoraproject.org/gmixer into f15
    
    Conflicts:
    	gmixer.spec

 dead.package                                 |    1 +
 gmixer-1.3-local-variable-not-assigned.patch |   12 -----
 gmixer-1.3-no-title.patch                    |   17 -------
 gmixer-1.3-setup-py.patch                    |   34 --------------
 gmixer-1.3-tracklist.patch                   |   43 -----------------
 gmixer-trayicon.desktop                      |   17 -------
 gmixer.desktop                               |   15 ------
 icons.patch                                  |   64 --------------------------
 sources                                      |    1 -
 trayicon_transparency.patch                  |   44 ------------------
 version_fix.patch                            |   11 ----
 11 files changed, 1 insertions(+), 258 deletions(-)
---