[gtpd-cvs] [gtkpod/clarity: 4/4] Merge branch 'gtk-3.0' into clarity

[phantomjinx <pha...@us...>]

commit 75bd71925d82bdabff4fe6e8dcf05c4ac14fd005
Merge: 94ece12 26bf8ba
Author: phantomjinx <p.g...@ph...>
Date:   Mon Sep 12 20:58:30 2011 +0100

    Merge branch 'gtk-3.0' into clarity
    
    Conflicts:
    	version.sh

 plugins/track_display/plugin.c |    6 +++---
 version.sh                     |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
---