Merge branch 'master' into Gtk.
authorMatt Birkholz <matt@birchwood-abbey.net>
Sat, 4 Mar 2017 00:26:42 +0000 (17:26 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Sat, 4 Mar 2017 00:26:42 +0000 (17:26 -0700)
commitd217cec4d7eec1dfbd8b1755a882bfc2d098287c
treed2ecd079da58d81babf6f03f799de29919be95a3
parentb08d57a70e57f30dca6875941090e9b56175f751
parent10f6fdd9ac5dc7a4fd50a8e4f302bd9a3d14f71a
Merge branch 'master' into Gtk.
src/Makefile.tools.in
src/runtime/runtime.pkg