| commit | d0eb91742daa5241a8e80099e100898a4fe568d2 | |
| author | Felix Bechstein <f@ub0r.de> | |
| Wed, 11 Nov 2009 21:27:27 +0000 (11 22:27 +0100) | ||
| committer | Felix Bechstein <f@ub0r.de> | |
| Wed, 11 Nov 2009 21:27:27 +0000 (11 22:27 +0100) | ||
| tree | 781332a3fd68e6a3af2c2114b57d246823c57c3f | treesnapshot (tar.gz zip) |
| parent | d8007a21f4ec17588f9339d99729c8feaeacbefd | commitdiff |
| parent | 7fb1c4cfcee1a999437227a133b003536454034f | commitdiff |
Merge branch 'innosend'
Conflicts:
res/values/update.xml
Conflicts:
res/values/update.xml
| res/values/strings.xml | diff1 | diff2 | blobhistory |
| res/values/update.xml | diff1 | diff2 | blobhistory |