1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-30 16:24:09 +03:00

Merge branch 'master' into ide-1.5.x

This commit is contained in:
Cristian Maglie
2013-11-04 10:36:53 +01:00
6 changed files with 174 additions and 8 deletions

View File

@ -104,6 +104,9 @@ editor.caret.blink=true
# area that's not in use by the text (replaced with tildes)
editor.invalid=false
# show line numbers in editor
editor.linenumbers = false
# enable ctrl-ins, shift-ins, shift-delete for cut/copy/paste
# on windows and linux, but disable on the mac
editor.keys.alternative_cut_copy_paste = true

View File

@ -10,6 +10,7 @@ ARDUINO 1.5.5 BETA
* Added warning message when opening sketches with additional files with illegal names
* (windows) Upgraded embedded Java runtime to version 7: much faster startup
* Improved files open/save dialogs
* Added line numbers, can be enabled/disabled from preferences (Cayci Gorlitsky)
[libraries]
* avr: Fixed buffer overflow in File::doBuffer() (dreggy)