projects / vuplus_dvbapp / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81c9052 30d3c4e)
Merge commit 'origin/translations'
authoracid-burn <acid-burn@opendreambox.org>
Wed, 31 Mar 2010 14:55:06 +0000 (16:55 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 31 Mar 2010 14:55:06 +0000 (16:55 +0200)
Conflicts:
po/de.po
po/sr.po

1  2 
po/de.po patch | diff1 | diff2 | blob | history
po/sr.po patch | diff1 | diff2 | blob | history

diff --cc po/de.po
Simple merge
diff --cc po/sr.po
Simple merge
Unnamed repository; edit this file 'description' to name the repository.