Skip to content

Conversation

@rlogiacco
Copy link
Collaborator

please accept this request only after we are sure 3.1 is working nicely as I've had tons of merge issues and I don't want to cause too many troubles to the still ongoing release

George Kankava and others added 17 commits April 11, 2016 14:10
…quid:S1118, squid:CommentedOutCodeLine, squid:S00116
…nts-fix-8

multiple code improvements: squid:S1066, squid:S1197, squid:S00117, squid:S1118, squid:CommentedOutCodeLine, squid:S00116
…squid:S1854, squid:S1066, squid:S1319, squid:S1444, squid:S1155, squid:S1192, squid:S1197, squid:S1213, squid:S1858, squid:S00117, squid:UselessParenthesesCheck
…nts-fix-7

multiple code improvements: squid:S1149, squid:CommentedOutCodeLine, squid:S1854, squid:S1066, squid:S1319, squid:S1444, squid:S1155, squid:S1192, squid:S1197, squid:S1213, squid:S1858, squid:S00117, squid:UselessParenthesesCheck
…nts-fix-9

multiple code improvements: squid:S1149, squid:S00117
…uid:S00117, squid:CommentedOutCodeLine, squid:S3008, squid:S00100, squid:S00116
…nts-fix-10

multiple code improvements: squid:S1118, squid:S1197, squid:S1213, squid:S00117, squid:CommentedOutCodeLine, squid:S3008, squid:S00100, squid:S00116
… squid:S3008, squid:S1213, squid:S00117, squid:S00116, squid:S1066, squid:S00115, squid:S1197, squid:S2184, squid:UselessParenthesesCheck
…nts-fix-11

multiple code improvements: squid:CommentedOutCodeLine, squid:S00108, squid:S3008, squid:S1213, squid:S00117, squid:S00116, squid:S1066, squid:S00115, squid:S1197, squid:S2184, squid:UselessParenthesesCheck
# Conflicts:
#	it.baeyens.arduino.common/src/it/baeyens/arduino/common/Common.java
#	it.baeyens.arduino.common/src/it/baeyens/arduino/common/Const.java
#	it.baeyens.arduino.common/src/it/baeyens/arduino/common/InstancePreferences.java
#	it.baeyens.arduino.core/src/it/baeyens/arduino/communication/ArduinoSerial.java
#	it.baeyens.arduino.core/src/it/baeyens/arduino/toolchain/ArduinoGnuMakefileGenerator.java
# Conflicts:
#	it.baeyens.arduino.common/src/it/baeyens/arduino/common/Const.java
#	it.baeyens.arduino.common/src/it/baeyens/arduino/common/InstancePreferences.java
#	it.baeyens.arduino.monitor/src/it/baeyens/arduino/monitor/views/SerialMonitor.java
Conflicts:
	it.baeyens.arduino.common/src/it/baeyens/arduino/common/Common.java
Conflicts:
	it.baeyens.arduino.core/src/it/baeyens/arduino/toolchain/ArduinoGnuMakefileGenerator.java
@jantje jantje merged commit 3346d0e into Sloeber:master Aug 4, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants