Skip to content

Commit 09e4202

Browse files
author
Joe Wegner
committed
Merge remote-tracking branch 'upstream/master'
2 parents 52c0f6e + 6116a8e commit 09e4202

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

app/src/processing/app/SerialPlotter.java

+4
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,10 @@ public void message(final String s) {
289289
messageBuffer.delete(0, linebreak + 1);
290290

291291
line = line.trim();
292+
if (line.length() == 0) {
293+
// the line only contained trimmable characters
294+
continue;
295+
}
292296
String[] parts = line.split("[, \t]+");
293297
if(parts.length == 0) {
294298
continue;

arduino-core/src/processing/app/BaseNoGui.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
public class BaseNoGui {
4242

4343
/** Version string to be used for build */
44-
public static final int REVISION = 10810;
44+
public static final int REVISION = 10811;
4545
/** Extended version string displayed on GUI */
46-
public static final String VERSION_NAME = "1.8.10";
46+
public static final String VERSION_NAME = "1.8.11";
4747
public static final String VERSION_NAME_LONG;
4848

4949
// Current directory to use for relative paths specified on the

build/linux/dist/install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ xdg_install_f() {
2929
TMP_DIR=`mktemp --directory`
3030

3131
# Create *.desktop file using the existing template file
32-
sed -e "s,<BINARY_LOCATION>,${SCRIPT_PATH}/arduino,g" \
32+
sed -e "s,<BINARY_LOCATION>,\"${SCRIPT_PATH}/arduino\",g" \
3333
-e "s,<ICON_NAME>,${RESOURCE_NAME},g" "${SCRIPT_PATH}/lib/desktop.template" > "${TMP_DIR}/${RESOURCE_NAME}.desktop"
3434

3535
# Install the icon files using name and resolutions

build/shared/revisions.txt

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
ARDUINO 1.8.11 ????
2+
3+
14
ARDUINO 1.8.10 2019.09.13
25

36
[ide]

0 commit comments

Comments
 (0)