# HG changeset patch # User dcubed # Date 1436891798 25200 # Node ID 39b1000561b9d62c0c385cf0a59e7876a863c958 # Parent b82c27650a7eaa5931d312afc97813e67500a511 8131128: Merge error in jprt.properties leads to missing devkit argument Summary: Add missing line break; fix backslash lineup. Reviewed-by: tbell, kvn diff -r b82c27650a7e -r 39b1000561b9 make/jprt.properties --- a/make/jprt.properties Fri Jul 10 16:37:18 2015 +0200 +++ b/make/jprt.properties Tue Jul 14 09:36:38 2015 -0700 @@ -121,10 +121,11 @@ ${jprt.fastdebugOpen.build.configure.args} jprt.i586.productOpen.build.configure.args= \ ${my.i586.default.build.configure.args} \ - ${jprt.productOpen.build.configure.args}jprt.windows_i586.build.configure.args= \ - --with-devkit=$VS2013_HOME \ + ${jprt.productOpen.build.configure.args} +jprt.windows_i586.build.configure.args= \ + --with-devkit=$VS2013_HOME \ ${jprt.i586.build.configure.args} -jprt.windows_x64.build.configure.args= \ +jprt.windows_x64.build.configure.args= \ --with-devkit=$VS2013_HOME ########