Merge branch 'master' into Gtk.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 8 Oct 2013 18:29:56 +0000 (11:29 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Tue, 8 Oct 2013 18:29:56 +0000 (11:29 -0700)
commit480813a99d2095ae6f0eb54a25a49b8106af9057
treedb11ab1e0d88d94b69e31b5d507a6155910e8387
parent30000aac11a41d895aa7ef155eca218abf739b9a
parentdfed4b3e5472c69ed0580deb7e3d30843428375b
Merge branch 'master' into Gtk.
src/Makefile.in