diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-11-24 19:37:43 +0100 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-11-24 19:37:43 +0100 |
| commit | 4218a944cf36890f6ab89d0bf1bf608be879343e (patch) | |
| tree | 0098afa9f0bba475820faec5e8246db3e367d898 /include | |
| parent | 3724774d26cdf4c067935ba3df5cb4824c201d84 (diff) | |
| parent | aede7bd47d3178fe434d665c0f836a70e169feeb (diff) | |
Merge branch 'local'
Conflicts:
lib/ncrypto_local.c
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions