commit e5b2bbd18726f2bf1bfbf6adedaa5da34b66333c
Merge: fe52be4 71b72c6
Author: phantomjinx <[email protected]>
Date: Sat May 7 02:03:24 2011 +0100
Merge branch 'master' into gtk-3.0
Conflicts:
configure.ac
plugins/cover_display/display_coverart.c
plugins/playlist_display/playlist_display_spl.c
plugins/repository_editor/repository.c
plugins/repository_editor/repository_init.c
plugins/sorttab_display/display_sorttabs.c
plugins/track_display/display_tracks.c
plugins/playlist_display/playlist_display_spl.c | 13 +++++-
plugins/repository_editor/repository.c | 9 ++++-
plugins/repository_editor/repository_init.c | 11 ++++-
plugins/sorttab_display/display_sorttabs.c | 45 ++++++++++++++++-----
plugins/sorttab_display/sorttab_display_actions.c | 8 ++--
plugins/track_display/display_tracks.c | 27 ------------
plugins/track_display/display_tracks.h | 2 -
7 files changed, 67 insertions(+), 48 deletions(-)
---
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
