diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-11 15:55:48 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-11 15:55:48 -0300 |
| commit | 22da6593a9bb762389251b4343925d3f2e00fa77 (patch) | |
| tree | 81f72794e28d48e36dd1b5a149154cf9a7b7e79c /Makefile | |
| parent | 48589bbdf210e11f44fdb76d7e91f6fa7e279c8e (diff) | |
| parent | 5336cde1fb05da618b01aac39777655497065d5e (diff) | |
Merge remote-tracking branch 'kali/hotfix/fix-keyring-dep' into develop
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions