summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-27 14:56:02 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-27 14:56:02 -0300
commit5ef6f1ae070ed7e5236aab119d7785f70e54b8e3 (patch)
tree4227d6bec94a442704755ea663a985406b4dc52f /pkg
parentda1b6ca41afca38a1e44315c8f0c1b4496e272f4 (diff)
parentf1f92bd97cf71db417b7b801b4bfe7e3df11e554 (diff)
Merge remote-tracking branch 'kali/hotfix/add_manifest' into develop
Diffstat (limited to 'pkg')
0 files changed, 0 insertions, 0 deletions