Hans Fugal 79986643c0 r269@gandalf: fugalh | 2006-08-03 20:18:05 -0600 ... Trunk merge conflicts resolved git-svn-id: svn://localhost/ardour2/branches/undo@756 d708f5d6-7413-0410-9779-e7cbd77b26cf		2006-08-04 02:18:45 +00:00
..
.cvsignore	Initial import of gtk2_ardour.	2005-09-25 18:42:24 +00:00
de_DE.po	merging trunk	2006-06-29 14:19:37 +00:00
el_GR.po	merging trunk	2006-06-29 14:19:37 +00:00
es_ES.po	merging trunk	2006-06-29 14:19:37 +00:00
fr_FR.po	merging trunk	2006-06-29 14:19:37 +00:00
it_IT.po	merging trunk	2006-06-29 14:19:37 +00:00
pt_BR.po	merging trunk	2006-06-29 14:19:37 +00:00
pt_PT.po	merging trunk	2006-06-29 14:19:37 +00:00
ru_RU.po	merging trunk	2006-06-29 14:19:37 +00:00
SConscript	r269@gandalf: fugalh | 2006-08-03 20:18:05 -0600	2006-08-04 02:18:45 +00:00