Merge pull request #80 from planetf1/agenda04Jul24

meetings/2024-07-04/minutes.md

@@ -0,0 +1,16 @@
+# 2024-07-04 : TSC Agenda
+
+* Welcome
+* [Minutes/actions from previous meeting](https://github.com/pq-code-package/tsc/pull/78/files)
+* Updates from related communities:
+ * [PQCA](https://github.com/PQCA)
+ * [Open Quantum Safe](https://github.com/open-quantum-safe)
+* Review status of sub projects:
+ * [mlkem-c-generic](https://github.com/pq-code-package/mlkem-c-generic)
+ * [mlkem-c-embedded](https://github.com/pq-code-package/mlkem-c-embedded)
+ * [mlkem-c-aarch64](https://github.com/pq-code-package/mlkem-c-aarch64)
+ * [mkkem-libjade](https://github.com/pq-code-package/mlkem-libjade)
+ * [mlkem-rust-libcrux](https://github.com/pq-code-package/mlkem-rust-libcrux)
+ * [documentation](https://github.com/pq-code-package/documentation)
+* [open TSC issues](https://github.com/orgs/pq-code-package/projects/4/views/1): 
+* Any other business

meetings/index.md

@@ -1,6 +1,6 @@
 # Minutes and agenda
 
-<<<<<<< HEAD
+* 2024-07-04 : [agenda/minutes](2024-07-04/minutes.md) (combined minutes/agenda)
 * 2024-06-20 : [agenda](2024-06-20/agenda.md) / minutes
 * 2024-06-06 : [agenda](2024-06-06/agenda.md) / [minutes](2024-06-06/minutes.md) 
 * 2024-05-23 : [agenda](2024-05-23/agenda.md) / [minutes](2024-05-23/minutes.md)