Merge remote-tracking branch 'upstream/master'main

14 files changed, 0 insertions, 0 deletions

diff --git a/src/standalone/upg2/about-main.c b/src/standalone/lab01/about-main.c
index 2407c23..2407c23 100644
--- a/src/standalone/upg2/about-main.c
+++ b/src/standalone/lab01/about-main.c
diff --git a/src/standalone/upg6/main.c b/src/standalone/lab02/main.c
index c481d40..c481d40 100644
--- a/src/standalone/upg6/main.c
+++ b/src/standalone/lab02/main.c
diff --git a/src/standalone/upg6/map.c b/src/standalone/lab02/map.c
index b323fbb..b323fbb 100644
--- a/src/standalone/upg6/map.c
+++ b/src/standalone/lab02/map.c
diff --git a/src/standalone/upg6/map.h b/src/standalone/lab02/map.h
index 9029ff5..9029ff5 100644
--- a/src/standalone/upg6/map.h
+++ b/src/standalone/lab02/map.h
diff --git a/src/standalone/upg8/setup-argv.c b/src/standalone/lab07/setup-argv.c
index f2bd04a..f2bd04a 100644
--- a/src/standalone/upg8/setup-argv.c
+++ b/src/standalone/lab07/setup-argv.c
diff --git a/src/standalone/upg5/pagedir.c b/src/standalone/lab14/pagedir.c
index b60d871..b60d871 100644
--- a/src/standalone/upg5/pagedir.c
+++ b/src/standalone/lab14/pagedir.c
diff --git a/src/standalone/upg5/pagedir.h b/src/standalone/lab14/pagedir.h
index 2919d1a..2919d1a 100644
--- a/src/standalone/upg5/pagedir.h
+++ b/src/standalone/lab14/pagedir.h
diff --git a/src/standalone/upg5/pagedir.o b/src/standalone/lab14/pagedir.o
index 470080a..470080a 100644
--- a/src/standalone/upg5/pagedir.o
+++ b/src/standalone/lab14/pagedir.o
diff --git a/src/standalone/upg5/thread.h b/src/standalone/lab14/thread.h
index 62568ab..62568ab 100644
--- a/src/standalone/upg5/thread.h
+++ b/src/standalone/lab14/thread.h
diff --git a/src/standalone/upg5/verify_adr.c b/src/standalone/lab14/verify_adr.c
index 9bac64f..9bac64f 100644
--- a/src/standalone/upg5/verify_adr.c
+++ b/src/standalone/lab14/verify_adr.c
diff --git a/src/standalone/upg1/basics.c b/src/standalone/labx1/basics.c
index 62bc52c..62bc52c 100644
--- a/src/standalone/upg1/basics.c
+++ b/src/standalone/labx1/basics.c
diff --git a/src/standalone/upg3/fork-wait.c b/src/standalone/labx2/fork-wait.c
index 8ef4c07..8ef4c07 100644
--- a/src/standalone/upg3/fork-wait.c
+++ b/src/standalone/labx2/fork-wait.c
diff --git a/src/standalone/upg4/use-list.c b/src/standalone/labx3/use-list.c
index 065f71a..065f71a 100644
--- a/src/standalone/upg4/use-list.c
+++ b/src/standalone/labx3/use-list.c
diff --git a/src/standalone/upg7/debug.c b/src/standalone/labx4/debug.c
index d6a3707..d6a3707 100644
--- a/src/standalone/upg7/debug.c
+++ b/src/standalone/labx4/debug.c