diff options
author | Tanu Kaskinen <tanuk@iki.fi> | 2009-06-29 18:35:06 +0300 |
---|---|---|
committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-06-29 18:35:06 +0300 |
commit | 0bc538b08ca5c4efea86700cb6c4685da3f34345 (patch) | |
tree | e5b0fe4b967ecb7e9251faf21904bbbe825aaab7 /po/LINGUAS | |
parent | b152f3a052eca7225870a7dc4d8a719bee107f0f (diff) | |
parent | 2654eb7781ddcfe53064745bbad77bffe5c8eada (diff) |
Merge branch 'master' into dbus-work
Conflicts:
src/daemon/daemon-conf.c
src/daemon/daemon-conf.h
src/daemon/main.c
src/pulsecore/dbus-util.h
Diffstat (limited to 'po/LINGUAS')
-rw-r--r-- | po/LINGUAS | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -2,13 +2,14 @@ as bn_IN ca cs -de de_CH +de el es fi fr gu +hi it kn mr @@ -17,8 +18,9 @@ or pa pl pt_BR -sr +pt sr@latin +sr sv ta te |