diff options
| author | James Booth <boothj5@gmail.com> | 2014-01-03 00:51:03 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2014-01-03 00:51:03 +0000 |
| commit | cd4f4d0b1a29c642384ff6d6fff7bdf3573fa04e (patch) | |
| tree | f6307e8ded171deb9e80bd997a58b959288d53da /src/config | |
| parent | 785206a06ce7256b8d28f23feb783a8d676c90d3 (diff) | |
| parent | 0cdbfecb35670fbcb84f0b6914cc35460f2fb3ca (diff) | |
| download | profani-tty-cd4f4d0b1a29c642384ff6d6fff7bdf3573fa04e.tar.gz | |
Merge remote-tracking branch 'pasis/iss269'
Conflicts: configure.ac
Diffstat (limited to 'src/config')
0 files changed, 0 insertions, 0 deletions