Merge branch 'master' into Gtk.
authorMatt Birkholz <puck@birchwood-abbey.net>
Thu, 23 Oct 2014 08:06:23 +0000 (01:06 -0700)
committerMatt Birkholz <puck@birchwood-abbey.net>
Thu, 23 Oct 2014 08:06:23 +0000 (01:06 -0700)
commitb7eb0f4018af4c34aa1fda18db53d99b41b291e8
tree61e05f3ba75b5c7eb4be058174c724b374a5cda6
parentc46722660643c38fda6e3261d835a93499ae7d1e
parentc5472b5ac891ce5d53d57968dc1f661958f6e975
Merge branch 'master' into Gtk.
src/Makefile.in