diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-05-21 08:52:05 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-05-21 08:52:05 -0300 |
| commit | 8448a42c81da482063233da48dc66a5ddcf7d13d (patch) | |
| tree | fbf91cfed9a472c9910e991b010d3209ad62c963 /data/images/black/32 | |
| parent | 548b413939362e23f7dd84b80519c7eb6c052e76 (diff) | |
| parent | a68960c1dcb7670687cb08610c9132cdf9b5a595 (diff) | |
Merge remote-tracking branch 'refs/remotes/kali/feature/psutil-compat' into develop
Diffstat (limited to 'data/images/black/32')
0 files changed, 0 insertions, 0 deletions