commit b80ce383e0fc02d370e09d419d0421e143120b1f
Merge: 068590a 915a763
Author: Daniele Forsi <[email protected]>
Date: Thu Jul 28 17:44:26 2011 +0200
Merge branch 'master' into gtk-3.0
Conflicts:
po/it.po
src/main.c
libgtkpod/syncdir.c | 1 -
plugins/cover_display/fetchcover.c | 2 +-
plugins/filetype_ogg/oggfile.c | 2 +-
po/it.po | 8 ++++++--
src/main.c | 1 -
5 files changed, 8 insertions(+), 6 deletions(-)
---
diff --cc src/main.c
index 04020bc,0df002d..bb9ddd0
--- a/src/main.c
+++ b/src/main.c
@@@ -32,8 -32,6 +32,7 @@@
#include <stdlib.h>
#include <time.h>
- #include <libintl.h>
+#include <gtk/gtk.h>
#include "gtkpod.h"
#include <glib/gi18n-lib.h>
------------------------------------------------------------------------------
Got Input? Slashdot Needs You.
Take our quick survey online. Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
