From: TheRaspyDev <theraspydev@gmail.com>
Date: Fri, 19 May 2017 08:13:40 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/joan2937/pigpio
X-Git-Tag: archive/raspbian/1.68-2+rpi1~58^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=51e7df2b6c476c346981ef5e052b1652accef5fe;p=pigpio.git

Merge branch 'master' of https://github.com/joan2937/pigpio

# Conflicts:
#	pigpio.c
---

51e7df2b6c476c346981ef5e052b1652accef5fe