summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-05-21 08:52:05 -0300
committerTomás Touceda <chiiph@leap.se>2014-05-21 08:52:05 -0300
commit8448a42c81da482063233da48dc66a5ddcf7d13d (patch)
treefbf91cfed9a472c9910e991b010d3209ad62c963 /Makefile
parent548b413939362e23f7dd84b80519c7eb6c052e76 (diff)
parenta68960c1dcb7670687cb08610c9132cdf9b5a595 (diff)
Merge remote-tracking branch 'refs/remotes/kali/feature/psutil-compat' into develop
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions