Merge branch 'master' into xwidget
commitd6ada5ae0fad7a5c85eb28b102bc460e9fe0aceb
authorJoakim Verona <joakim@verona.se>
Wed, 21 Jan 2015 23:05:27 +0000 (22 00:05 +0100)
committerJoakim Verona <joakim@verona.se>
Wed, 21 Jan 2015 23:05:27 +0000 (22 00:05 +0100)
treeaa8b504032eb09caa6f5eae6038a38b87ada198b
parent487d6cdc4dfc6500885dfa57a7c2fac8a1760fec
parent20f66485526b69eb26f2e70bd835a5e1333559d5
Merge branch 'master' into xwidget
configure.ac