# HG changeset patch
# User chainsaw
# Date 1170238267 28800
# Node ID 617d5cc31d9544b8a93a5d8087c2f6669d1bb843
# Parent  48c352f89a4e8b4f5480bcbe1a960bc61a409cfd
[svn] Conflict markers upset msgmerge. Removed them.

diff -r 48c352f89a4e -r 617d5cc31d95 ChangeLog
--- a/ChangeLog	Wed Jan 31 01:48:50 2007 -0800
+++ b/ChangeLog	Wed Jan 31 02:11:07 2007 -0800
@@ -1,3 +1,11 @@
+2007-01-31 09:48:50 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [3908]
+  - avoid multiple open of filebrowser
+  
+  trunk/src/audacious/ui_fileopener.c |    8 +++++---
+  1 file changed, 5 insertions(+), 3 deletions(-)
+
+
 2007-01-30 22:21:06 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [3906]
   - mark some strings used by GOption as translatable
diff -r 48c352f89a4e -r 617d5cc31d95 po/sr.po
--- a/po/sr.po	Wed Jan 31 01:48:50 2007 -0800
+++ b/po/sr.po	Wed Jan 31 02:11:07 2007 -0800
@@ -1,6 +1,7 @@
 # translation of sr.po to Serbian Latin
 # Copyright (C) 2007 Strahinja  Kustudić <kustodian@gmail.com>
 # This file is distributed under the same license as the Audacious package.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: sr\n"