chiark / gitweb /
Merge branch 'fix-build-and-vlc' into 'master'
authorCiaran Gultnieks <ciaran@ciarang.com>
Tue, 7 Feb 2017 13:27:56 +0000 (13:27 +0000)
committerCiaran Gultnieks <ciaran@ciarang.com>
Tue, 7 Feb 2017 13:27:56 +0000 (13:27 +0000)
commit70c347264cfb3f979cadb60a06481e878314acec
tree00140d1a672c76b228308c795d0a15f26d804158
parentc344c31271dd140fe4c7e9270161ec716b5d5da1
parent6debb3ebbf0fdbfeb49f80891fd8ba38cea72cd7
Merge branch 'fix-build-and-vlc' into 'master'

fix CI, makebuildserver, and VLC build

See merge request !204