commit a3830e3c87c9839903fa94038da8ded76b383dc3
Merge: bcf96a2 b82c87d
Author: Daniele Forsi <[email protected]>
Date: Wed Jul 27 12:19:55 2011 +0200
Merge branch 'master' into gtk-3.0
Don't merge changes to ChangeLog, NEWS and translations (except it.po).
Commands:
git checkout gtk-3.0
git merge master --strategy recursive --strategy-option ours --no-commit
git checkout HEAD^ ChangeLog NEWS
git checkout master po/it.po
git commit
generate-ChangeLog.sh | 1 -
libgtkpod/misc_track.c | 9 +-
plugins/cover_display/fetchcover.c | 18 +-
plugins/details_editor/details.c | 3 +-
plugins/details_editor/details_editor.xml | 2 +
plugins/exporter/file_export.c | 2 +-
plugins/filetype_mp4/mp4file.c | 8 +-
plugins/filetype_ogg/oggfile.c | 2 +-
plugins/filetype_video/videofile.c | 2 +-
plugins/filetype_wav/wavfile.c | 2 +-
plugins/plugins.mk | 2 +-
plugins/repository_editor/repository_init.c | 6 +-
po/POTFILES.in | 1 +
po/it.po | 1445 +++++++++++----------------
14 files changed, 597 insertions(+), 906 deletions(-)
---
------------------------------------------------------------------------------
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
