aboutsummaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorThialfihar <thialfihar@gmail.com>2010-08-15 17:35:21 +0000
committerThialfihar <thialfihar@gmail.com>2010-08-15 17:35:21 +0000
commitb3a63beffcac99d3c80d706f10a0b7144e808fec (patch)
treea9aeb799691ff4e19bfd92a2b9e91b671925e75d /res/layout
parentbd99b2590b9b619d90ce5ffe36d5526452883cbf (diff)
downloadopen-keychain-b3a63beffcac99d3c80d706f10a0b7144e808fec.tar.gz
open-keychain-b3a63beffcac99d3c80d706f10a0b7144e808fec.tar.bz2
open-keychain-b3a63beffcac99d3c80d706f10a0b7144e808fec.zip
merge conflict fixed
Diffstat (limited to 'res/layout')
0 files changed, 0 insertions, 0 deletions