summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui/ui/preferences.ui
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2014-10-06 12:57:46 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2014-10-06 12:57:46 -0300
commita57154017b47f14c51829bead81f7588f3db22ed (patch)
tree32f3b0e4be4e1cb2a153822327d5a1a0c3fdbf5a /src/leap/bitmask/gui/ui/preferences.ui
parent43217db58bf06f4b89f506f38bef64f536bc9bbb (diff)
parent50113102b7b089a576a14d459271ac3c2db48968 (diff)
Merge remote-tracking branch 'meskio/feature/keymanager_api' into develop
Diffstat (limited to 'src/leap/bitmask/gui/ui/preferences.ui')
0 files changed, 0 insertions, 0 deletions