summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-06-05 13:27:04 -0300
committerTomás Touceda <chiiph@leap.se>2014-06-05 13:27:04 -0300
commitb6b906cbfa82210d52805b4cf39bbc21b31b4a24 (patch)
treeb2ab43b1708009b7ac424ef96e3114a64b956189 /Makefile
parent82e1c4b1e3e5dd49b6e868732451a744ba37ba59 (diff)
parent556c589dd470ed2b48b5421c38156333da78c369 (diff)
Merge remote-tracking branch 'refs/remotes/kali/feature/bitmask-root-versioning' into develop
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions