diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-04-11 10:11:16 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-04-11 10:11:16 -0300 |
| commit | 16165296ef5d9d0964b5820dbe707c3b0adaffc2 (patch) | |
| tree | fc0b325ffdf23c5220ad07eeff294b8def32ff3c /src/leap/bitmask/gui/ui/preferences.ui | |
| parent | 76a2c224f26dbf270c49789ef779804baa1596f9 (diff) | |
| parent | ea12da968e2bda017ca161298c5560bf7dcfce42 (diff) | |
Merge remote-tracking branch 'refs/remotes/kali/bug/relax-psutil-pinning' into develop
Diffstat (limited to 'src/leap/bitmask/gui/ui/preferences.ui')
0 files changed, 0 insertions, 0 deletions