Merge branch 'master' of https://github.com/joan2937/pigpio
authorTheRaspyDev <theraspydev@gmail.com>
Fri, 19 May 2017 08:13:40 +0000 (10:13 +0200)
committerTheRaspyDev <theraspydev@gmail.com>
Fri, 19 May 2017 08:13:40 +0000 (10:13 +0200)
commit51e7df2b6c476c346981ef5e052b1652accef5fe
tree199d9ed2fd60a3a3ee1a682f708543defefbe314
parente1b7d8c5088987befa4d08af36d4fafbec572480
parent1aa4cca8a69d4f8f8ce198178dbd7f436b4f503c
Merge branch 'master' of https://github.com/joan2937/pigpio

# Conflicts:
# pigpio.c
pigpio.3
pigpio.h
pigpio.py