Merge commit 'origin/master-tx' into master-tx

Browse source

Conflicts:
	po/de.po

...

This commit is contained in:

Lennart Poettering 2008-10-07 21:38:06 +02:00

parent 3d7b76d159 8c2a7c8707

commit 5925d44013

7 changed files with 4503 additions and 134 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

386

po/de.po

View file

File diff suppressed because it is too large Load diff