summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-10-02 13:42:46 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-02 13:42:46 -0300
commit1a2f257cc2f15e3a3ad84c643c2e78ff58972b45 (patch)
tree923187d292002896dcda3b6449827b3df6b58d32 /Makefile
parent4f68e75ecbeb44ba391fa16683a9ec223095b8d9 (diff)
parentff32e6bda529fffa8aaf5ebb9abf9028e7f0917f (diff)
Merge remote-tracking branch 'kali/feature/update-dependencies' into develop
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions