Hane/tmr
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Compare commits

base: Hane:4f197cbcad8b368ff008f32c22e8b27613d6f78e
Branches Tags
Hane:main
Hane:dell
Hane:20240117
...
compare: Hane:a7fa81578f1fb0959412f15ad9b68fb21205ce1e
Branches Tags
Hane:main
Hane:dell
Hane:20240117

5 commits
4f197cbcad ... a7fa81578f

Author SHA1 Message Date
Hane
a7fa81578f aae# 2023-08-07 15:05:28 +02:00
Hane
ae4f271800 aaaa 2023-08-07 15:05:28 +02:00
Hane
5d34a280be a 2023-08-07 15:05:27 +02:00
Hane
5abb4cc98e ya 2023-08-07 15:05:13 +02:00
Hane
7fb72e2425 linus comes into playc 2023-08-07 15:03:04 +02:00
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/proto/proto.cpp
View file

@ -1,6 +1,19 @@
<<<<<<< HEAD
<<<<<<< HEAD
//si, bueno, testx //si, bueno, testx
//dossPxa //dossPxa
=======
<<<<<<< Updated upstream
=======
//si, bueno, testx
>>>>>>> Stashed changes
>>>>>>> 0ff6488 (linus comes into play)
=======
//si, bueno, testx
//dossPxa
>>>>>>> f35615e (ya)
/* /*
* THREADIN THE LINUS: https://linux.die.net/man/2/sched_setaffinity * THREADIN THE LINUS: https://linux.die.net/man/2/sched_setaffinity
*/ */