OSDN Git Service

Adjust incorrectly resolved 2012-09-14 merge from master.
authorKeith Marshall <keithmarshall@users.sourceforge.net>
Thu, 20 Sep 2012 21:27:28 +0000 (22:27 +0100)
committerKeith Marshall <keithmarshall@users.sourceforge.net>
Thu, 20 Sep 2012 21:27:28 +0000 (22:27 +0100)
commit8874d77303037ab288860b161fa8f04ec6603929
tree46d15ef39c3c0cc8b756fe035f1c9511165f806f
parentbcb11d3b92fd4309eae98fe19afd7d31aef08530
Adjust incorrectly resolved 2012-09-14 merge from 
ChangeLog
Makefile.in