Merge branch 'master' of ssh://repo.or.cz/srv/git/CallMeterNG
commit3a765bf3290a316906e762e88ff8a39d89628dbf
authorFelix Bechstein <f@ub0r.de>
Mon, 4 Jan 2010 19:02:11 +0000 (4 20:02 +0100)
committerFelix Bechstein <f@ub0r.de>
Mon, 4 Jan 2010 19:02:11 +0000 (4 20:02 +0100)
treeab3ffff74812f6b304911be32815559213635f40
parenta747c04f43a3f5fba1507af8ad5c0af35520590a
parent24ba386f47b49edc2a7cdbdbd1df914dbbb5c65c
Merge branch 'master' of ssh://repo.or.cz/srv/git/CallMeterNG
res/layout/about.xml
res/values-de/strings.xml
res/values-nl/strings.xml
res/values-pt/strings.xml
res/values/strings.xml
src/de/ub0r/de/android/callMeterNG/CallMeter.java