Merge branch 'master' into Gtk
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Thu, 30 May 2013 00:13:07 +0000 (17:13 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Thu, 30 May 2013 00:13:07 +0000 (17:13 -0700)
commitbfa03f35ce4f7b7f64cdbba54333393450715797
treeb82619dd477dfa6b7b2103458b3c8666ef3305b7
parentf57b43b26b8275d69279f8501ae78ddee2b4bc6a
parent2dc54b0fcc56ae79cd4e157af0661d3e8b6852d5
Merge branch 'master' into Gtk
doc/ffi/ffi.texinfo
src/Makefile.in