Cut down on merge conflicts.
authorBrian Aker <brian@tangent.org>
Tue, 23 Apr 2013 08:03:33 +0000 (04:03 -0400)
committerBrian Aker <brian@tangent.org>
Tue, 23 Apr 2013 08:03:33 +0000 (04:03 -0400)
commitfae7e491f6b2cb9e07aaca5739e13b26e0022e3b
treef163b765ed83a8e990eaeadc5d4775671f0ffbf9
parent39fb7a2961c2375233cea7e6ee46d92e0b00e8c0
Cut down on merge conflicts.
ChangeLog
configure.ac
version.m4 [new file with mode: 0644]