Manual merge of version 1.25.0+dfsg1-2+rpi1 and 1.26.1+dfsg1-3 to produce 1.26.1... archive/raspbian/1.26.1+dfsg1-3+rpi1 raspbian/1.26.1+dfsg1-3+rpi1
authorPeter Michael Green <plugwash@raspbian.org>
Fri, 22 Jun 2018 18:44:38 +0000 (19:44 +0100)
committerPeter Michael Green <plugwash@raspbian.org>
Fri, 22 Jun 2018 18:44:38 +0000 (19:44 +0100)
commit2f5aa60d737867af58f15f90318dbeccb0267b53
treedf4ec7cedc635369692e0aeec38f8fa1a8a861a1
parent40ae306a74262943e5df6eae97eb9b85ad1a2017
parent848b4519686357cf64b86fd63c65af526fb5b675
Manual merge of version 1.25.0+dfsg1-2+rpi1 and 1.26.1+dfsg1-3 to produce 1.26.1+dfsg1-3+rpi1

Drop change to src/binaryen/CMakeLists.txt which no longer exists.
debian/changelog
debian/rules