Merge branch 'master' into beamX

valdok · valdok · commit f132eb703613 · 2020-11-19T10:49:16.000+02:00
diff --git a/utility/cli/options.cpp b/utility/cli/options.cpp
@@ -326,7 +326,7 @@ namespace beam
         // shaders
         const char* SHADER_INVOKE       = "shader";
         const char* SHADER_ARGS         = "shader_args";
-        const char* SHADER_BYTECODE_MANAGER  = "shader_app_file";
+        const char* SHADER_BYTECODE_APP      = "shader_app_file";
         const char* SHADER_BYTECODE_CONTRACT = "shader_contract_file";
     }
 

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ namespace beam`
`326`	`326`	`// shaders`
`327`	`327`	`const char* SHADER_INVOKE = "shader";`
`328`	`328`	`const char* SHADER_ARGS = "shader_args";`
`329`		`- const char* SHADER_BYTECODE_MANAGER = "shader_app_file";`
	`329`	`+ const char* SHADER_BYTECODE_APP = "shader_app_file";`
`330`	`330`	`const char* SHADER_BYTECODE_CONTRACT = "shader_contract_file";`
`331`	`331`	`}`
`332`	`332`