PR

2023-02-21 11:26:55 +07:00 · 2023-02-21 11:26:55 +07:00 · 595fb2fb26
parent 18f4be356f
commit 595fb2fb26
31 changed files with 14582 additions and 0 deletions
--- a/Library/.fuse_hidden0000006b00000021
+++ b/Library/.fuse_hidden0000006b00000021
--- a/Library/.fuse_hidden0000006b00000027
+++ b/Library/.fuse_hidden0000006b00000027
--- a/Library/.fuse_hidden0000006e0000001b
+++ b/Library/.fuse_hidden0000006e0000001b
--- a/Library/.fuse_hidden0000006e00000028
+++ b/Library/.fuse_hidden0000006e00000028
--- a/Library/.fuse_hidden0000006f0000001c
+++ b/Library/.fuse_hidden0000006f0000001c
--- a/Library/.fuse_hidden0000006f00000029
+++ b/Library/.fuse_hidden0000006f00000029
--- a/Library/.fuse_hidden0000007000000022
+++ b/Library/.fuse_hidden0000007000000022
--- a/Library/.fuse_hidden000000700000002a
+++ b/Library/.fuse_hidden000000700000002a
--- a/Library/.fuse_hidden0000a32700000024
+++ b/Library/.fuse_hidden0000a32700000024
--- a/Library/.fuse_hidden0000a3270000002b
+++ b/Library/.fuse_hidden0000a3270000002b
--- a/Library/.fuse_hidden0000cbc700000035
+++ b/Library/.fuse_hidden0000cbc700000035
--- a/Library/.fuse_hidden0000cbc800000036
+++ b/Library/.fuse_hidden0000cbc800000036
--- a/Library/Bee/.fuse_hidden0000c99300000031
+++ b/Library/Bee/.fuse_hidden0000c99300000031
--- a/Library/Bee/.fuse_hidden0000c99400000032
+++ b/Library/Bee/.fuse_hidden0000c99400000032
--- a/Library/Bee/.fuse_hidden0000c99500000033
+++ b/Library/Bee/.fuse_hidden0000c99500000033
--- a/Library/Bee/2400b0aEDbg.dag_fsmtime
+++ b/Library/Bee/2400b0aEDbg.dag_fsmtime
--- a/Library/Bee/backend2.traceevents
+++ b/Library/Bee/backend2.traceevents
--- a/Library/Bee/buildprogram0.traceevents
+++ b/Library/Bee/buildprogram0.traceevents
@ -11,6 +11,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 3f6d86405 (successfull build with vulkan on linux)
 =======
@ -100,6 +101,8 @@
 { "pid": 35942, "tid": 1, "ts": 1676624094493213, "dur": 2598, "ph": "X", "name": "Write chrome-trace events", "args": {} },
 >>>>>>> 106e381fe (Add new RecipeSOs with Bacon)
 =======
+=======
+>>>>>>> 170e06235 (PR)
 { "pid": 35942, "tid": 1, "ts": 1676799589194403, "dur": 483170, "ph": "X", "name": "BuildProgram", "args": {} },
 { "pid": 35942, "tid": 1, "ts": 1676799589200466, "dur": 124318, "ph": "X", "name": "BuildProgramContextConstructor", "args": {} },
 { "pid": 35942, "tid": 1, "ts": 1676799589559151, "dur": 6332, "ph": "X", "name": "OutputData.Write", "args": {} },
@ -107,4 +110,16 @@
 { "pid": 35942, "tid": 1, "ts": 1676799589566537, "dur": 52284, "ph": "X", "name": "JsonToString", "args": {} },
 { "pid": 35942, "tid": 1, "ts": 1676799589685335, "dur": 1449, "ph": "X", "name": "", "args": {} },
 { "pid": 35942, "tid": 1, "ts": 1676799589684740, "dur": 2329, "ph": "X", "name": "Write chrome-trace events", "args": {} },
+<<<<<<< HEAD
 >>>>>>> 87af8f2d8 (init)
+=======
+=======
+{ "pid": 35942, "tid": 1, "ts": 1676975143257307, "dur": 410686, "ph": "X", "name": "BuildProgram", "args": {} },
+{ "pid": 35942, "tid": 1, "ts": 1676975143258410, "dur": 53546, "ph": "X", "name": "BuildProgramContextConstructor", "args": {} },
+{ "pid": 35942, "tid": 1, "ts": 1676975143530509, "dur": 5808, "ph": "X", "name": "OutputData.Write", "args": {} },
+{ "pid": 35942, "tid": 1, "ts": 1676975143536320, "dur": 131664, "ph": "X", "name": "Backend.Write", "args": {} },
+{ "pid": 35942, "tid": 1, "ts": 1676975143537493, "dur": 52671, "ph": "X", "name": "JsonToString", "args": {} },
+{ "pid": 35942, "tid": 1, "ts": 1676975143675268, "dur": 1342, "ph": "X", "name": "", "args": {} },
+{ "pid": 35942, "tid": 1, "ts": 1676975143674798, "dur": 2126, "ph": "X", "name": "Write chrome-trace events", "args": {} },
+>>>>>>> 51f9afbee (PR)
+>>>>>>> 170e06235 (PR)
--- a/Library/Bee/fullprofile.json
+++ b/Library/Bee/fullprofile.json
--- a/Library/Bee/tundra.log.json
+++ b/Library/Bee/tundra.log.json
--- a/Library/Search/.fuse_hidden0000a32500000023
+++ b/Library/Search/.fuse_hidden0000a32500000023
--- a/Library/Search/.fuse_hidden0000a3250000002c
+++ b/Library/Search/.fuse_hidden0000a3250000002c
--- a/Library/Search/.fuse_hidden0000c96d00000034
+++ b/Library/Search/.fuse_hidden0000c96d00000034
--- a/Logs/.fuse_hidden0000c2870000001e
+++ b/Logs/.fuse_hidden0000c2870000001e
@ -0,0 +1,3 @@
+Base path: '/home/sascha/Unity/Hub/Editor/2023.1.0a26/Editor/Data', plugins path '/home/sascha/Unity/Hub/Editor/2023.1.0a26/Editor/Data/PlaybackEngines'
+Cmd: initializeCompiler
+
--- a/Logs/.fuse_hidden0000c2870000002d
+++ b/Logs/.fuse_hidden0000c2870000002d
@ -0,0 +1,3 @@
+Base path: '/home/sascha/Unity/Hub/Editor/2023.1.0a26/Editor/Data', plugins path '/home/sascha/Unity/Hub/Editor/2023.1.0a26/Editor/Data/PlaybackEngines'
+Cmd: initializeCompiler
+
--- a/Temp/.fuse_hidden0000005a0000001f
+++ b/Temp/.fuse_hidden0000005a0000001f
--- a/Temp/.fuse_hidden0000005a0000002e
+++ b/Temp/.fuse_hidden0000005a0000002e
--- a/Temp/.fuse_hidden0000c27b00000020
+++ b/Temp/.fuse_hidden0000c27b00000020
--- a/Temp/.fuse_hidden0000c27b0000002f
+++ b/Temp/.fuse_hidden0000c27b0000002f
--- a/Temp/.fuse_hidden0000c27c0000001d
+++ b/Temp/.fuse_hidden0000c27c0000001d
--- a/Temp/.fuse_hidden0000c27c00000030
+++ b/Temp/.fuse_hidden0000c27c00000030