Skip to content
  • Cristian Maglie's avatar
    Merge branch 'master' into ide-1.5.x · 5dbe5c28
    Cristian Maglie authored
    Conflicts:
    	build/shared/examples/02.Digital/BlinkWithoutDelay/BlinkWithoutDelay.ino
    	build/shared/examples/09.USB/Keyboard/KeyboardMessage/KeyboardMessage.ino
    	libraries/LiquidCrystal/examples/CustomCharacter/CustomCharacter.ino
    	libraries/SD/examples/listfiles/listfiles.ino
    5dbe5c28