{"head":"23b7db18934b19c84e8cc8f78c1694393f55a5e0","size":2,"push_id":44911372,"shas":[["bdd2e2a0a6e1dad0c6106c70e9a7f2812c434b9f","310ca7c98f9dd5505bd23c4bee14ed735ac69e24@accense.com","Merge branch 'new-extension' of https://github.com/arduino/Arduino into i18nWork\n\nConflicts:\n\tapp/src/processing/app/Editor.java\n\tapp/src/processing/app/Sketch.java\n\tbuild/shared/examples/4.Communication/SerialCallResponse/SerialCallResponse.pde\n\tbuild/shared/lib/theme/theme.txt\n\thardware/arduino/cores/arduino/HardwareSerial.h\n\thardware/arduino/cores/arduino/Print.cpp\n\thardware/arduino/cores/arduino/WString.h\n\thardware/arduino/variants/mega/pins_arduino.h\n\tlibraries/Ethernet/examples/PachubeClient/PachubeClient.ino\n\tlibraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino\n\tlibraries/Firmata/examples/EchoString/EchoString.ino\n\tlibraries/SD/File.cpp\n\tlibraries/SoftwareSerial/SoftwareSerial.cpp\n\tlibraries/SoftwareSerial/SoftwareSerial.h\n\tlibraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino\n\tlibraries/SoftwareSerial/keywords.txt","Shigeru KANEMOTO"],["23b7db18934b19c84e8cc8f78c1694393f55a5e0","310ca7c98f9dd5505bd23c4bee14ed735ac69e24@accense.com","Solved the conflicts.","Shigeru KANEMOTO"]],"ref":"refs/heads/i18nWork"}