diff options
| author | kali <kali@leap.se> | 2013-01-25 07:23:04 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2013-01-25 07:23:04 +0900 |
| commit | 74fb141d33b195a425f3eece63fdd7bcc0b970ab (patch) | |
| tree | 51ca9e8fa8375e5b996bcec7818b5db3e88799be /pkg/linux/resolv-update | |
| parent | e16d462c4eb24bfc3866e65184ac0b77f5baeb16 (diff) | |
| parent | a1d880f201c914777daa8f416d5c25ab03e5b05d (diff) | |
Merge branch 'feature/dirspec' into develop
Conflicts:
pkg/requirements.pip
Diffstat (limited to 'pkg/linux/resolv-update')
0 files changed, 0 insertions, 0 deletions