aboutsummaryrefslogtreecommitdiffstats
path: root/.settings
diff options
context:
space:
mode:
authorJohn Heroy <johnheroy@gmail.com>2015-10-27 14:05:14 -0700
committerJohn Heroy <johnheroy@gmail.com>2015-10-27 14:05:14 -0700
commitbb206a6380f32d0ee48ba856b364fe3697cf7d47 (patch)
tree5a664c7731d33ccaad2cbd83a270df32ac94eba0 /.settings
parent951d4f609803e92ac1594a8ca4af1165baca8573 (diff)
parent63a8a42db55fb9d6f101e5c77ec2d753e45b26c5 (diff)
downloadconnectbot-bb206a6380f32d0ee48ba856b364fe3697cf7d47.tar.gz
connectbot-bb206a6380f32d0ee48ba856b364fe3697cf7d47.tar.bz2
connectbot-bb206a6380f32d0ee48ba856b364fe3697cf7d47.zip
Merge branch 'master' into canceldialog
Diffstat (limited to '.settings')
0 files changed, 0 insertions, 0 deletions