Commit graph

2 commits

Author SHA1 Message Date
Peter Jones
8c6b1ac71e Reconcile with upstream once again.
Also include some minor fixes for gcc 5.1.1

Signed-off-by: Peter Jones <pjones@redhat.com>
2015-07-22 09:46:32 -04:00
Peter Jones
b02c700d6c Be less terrible with .gitignore
We lost a man page because of this bzrignore<->gitignore junk, so solve
that slightly better.

Signed-off-by: Peter Jones <pjones@redhat.com>
2015-07-22 09:16:02 -04:00