diff options
| author | Linus Nordberg <linus@nordu.net> | 2012-09-14 10:32:53 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2012-10-30 11:43:42 +0100 |
| commit | 8c8a1423c3d407bd119b75aae93386bbfd0176e2 (patch) | |
| tree | 32cf819602b0d3da5ba0bcb0758a88636b16a2e5 /aclocal.m4 | |
| parent | 7c623adb88bca75fbdac6b6d34bfa069a58ee696 (diff) | |
| parent | 9142e68885bb6d19f0f6d44c4d8daf5ae4d12cbe (diff) | |
Merge branch 'licensing-nogpl'
Conflicts:
configure.ac
Diffstat (limited to 'aclocal.m4')
0 files changed, 0 insertions, 0 deletions