diff options
| author | James Booth <boothj5@gmail.com> | 2013-09-17 01:34:57 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2013-09-17 01:34:57 +0100 |
| commit | cab2e3cfe41cf75de8c38ed4a6c2dd732fc3cc62 (patch) | |
| tree | 8e0450f180f82f3373850a4a519f3d7d2f9ef184 /.gitignore | |
| parent | e90ba5747be68465d5b5080fe769380c061fc881 (diff) | |
| parent | ee8ff948bfc1a21a10ea7e5bb34fffde781624e6 (diff) | |
| download | profani-tty-cab2e3cfe41cf75de8c38ed4a6c2dd732fc3cc62.tar.gz | |
Merge branch 'master' into otr
Conflicts: .gitignore Makefile.am
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 3748015d..28e639f4 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ TODO plugins/ *_key.txt *_fingerprints.txt +src/gitversion.c |