comparison ChangeLog @ 2450:617d5cc31d95 trunk

[svn] Conflict markers upset msgmerge. Removed them.
author chainsaw
date Wed, 31 Jan 2007 02:11:07 -0800
parents 48c352f89a4e
children 579e2f7d17ad
comparison
equal deleted inserted replaced
2449:48c352f89a4e 2450:617d5cc31d95
1 2007-01-31 09:48:50 +0000 Yoshiki Yazawa <yaz@cc.rim.or.jp>
2 revision [3908]
3 - avoid multiple open of filebrowser
4
5 trunk/src/audacious/ui_fileopener.c | 8 +++++---
6 1 file changed, 5 insertions(+), 3 deletions(-)
7
8
1 2007-01-30 22:21:06 +0000 William Pitcock <nenolod@sacredspiral.co.uk> 9 2007-01-30 22:21:06 +0000 William Pitcock <nenolod@sacredspiral.co.uk>
2 revision [3906] 10 revision [3906]
3 - mark some strings used by GOption as translatable 11 - mark some strings used by GOption as translatable
4 12
5 trunk/src/audacious/main.c | 30 +++++++++++++++--------------- 13 trunk/src/audacious/main.c | 30 +++++++++++++++---------------