Merge branch 'master' into xwidget_mvp
commit8a5b2d3e3eb28eea2cf6f44d76a83b438e14dc28
authorJoakim Verona <joakim@verona.se>
Thu, 19 Mar 2015 22:35:34 +0000 (19 23:35 +0100)
committerJoakim Verona <joakim@verona.se>
Thu, 19 Mar 2015 22:35:34 +0000 (19 23:35 +0100)
tree22012268d5da5ea37a474150b51326bbd5771502
parent293c6a2481f5da18a7ba8d0efa573c12ce6a2cbf
parenta68aa2e15be21297d6e8dccb2bcd86422fdebe15
Merge branch 'master' into xwidget_mvp
configure.ac