Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync

Sync 2026-04-18 00:00
Sync 2026-04-17 14:20
2026-04-18 00:00:10 +09:00 · 2026-04-18 00:00:10 +09:00 · 2026-04-17 14:20:17 +00:00 · 2026-04-17 22:00:07 +09:00 · 2026-04-17 22:00:07 +09:00 · 2026-04-17 12:20:11 +00:00
5 changed files with 1 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ __pycache__/
 *.db-shm
 *.db-journal
 !state_*.db
+state_merged.db
--- a/state_10-40-29-186.db
+++ b/state_10-40-29-186.db
--- a/state_MixdeMac-mini.local.db
+++ b/state_MixdeMac-mini.local.db
--- a/state_merged.db
+++ b/state_merged.db
--- a/state_soe219028.db
+++ b/state_soe219028.db
Author	SHA1	Message	Date
Mixer	5fd8081646	Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync	2026-04-18 00:00:10 +09:00
Mixer	5adbf31d09	Sync 2026-04-18 00:00	2026-04-18 00:00:10 +09:00
Mixer	56bc2a53f7	Sync 2026-04-17 14:20	2026-04-17 14:20:17 +00:00
Mixer	c58befd27a	Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync	2026-04-17 22:00:07 +09:00
Mixer	c4865d3e62	Sync 2026-04-17 22:00	2026-04-17 22:00:07 +09:00
Mixer	394d149954	Sync 2026-04-17 12:20	2026-04-17 12:20:11 +00:00
Mixer	ddbfe5a321	Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync	2026-04-17 20:00:06 +09:00
Mixer	67e1c19dee	Sync 2026-04-17 20:00	2026-04-17 20:00:05 +09:00
Mixer	7d368e52c2	Sync 2026-04-17 10:20	2026-04-17 10:20:09 +00:00
Mixer	76fa3117ca	Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync	2026-04-17 18:00:04 +09:00
Mixer	e1399098f0	Sync 2026-04-17 18:00	2026-04-17 18:00:03 +09:00
Mixer	e93a8c3bef	Sync 2026-04-17 08:20	2026-04-17 08:20:07 +00:00
Mixer	a842f38cc2	Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync	2026-04-17 16:00:04 +09:00
Mixer	a5c9c8d687	Sync 2026-04-17 16:00	2026-04-17 16:00:04 +09:00
Mixer	16aaa54d4f	Sync 2026-04-17 06:20	2026-04-17 06:20:07 +00:00
Mixer	3211c9b953	Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync	2026-04-17 14:00:03 +09:00
Mixer	87955f80e0	Sync 2026-04-17 14:00	2026-04-17 14:00:02 +09:00
Mixer	d6759f9fd7	Sync 2026-04-17 04:20	2026-04-17 04:20:06 +00:00
Mixer	2e3d83cbab	Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync	2026-04-17 12:00:02 +09:00
Mixer	fe76773cb5	Sync 2026-04-17 12:00	2026-04-17 12:00:02 +09:00
Mixer	9298ebf965	Sync 2026-04-17 02:20	2026-04-17 02:20:04 +00:00
Mixer	50000c0dc0	Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync	2026-04-17 10:00:03 +09:00
Mixer	e03ac06f03	Sync 2026-04-17 10:00	2026-04-17 10:00:02 +09:00
Mixer	d95b580e5f	Sync 2026-04-17 00:20	2026-04-17 00:20:05 +00:00
Mixer	3615ca15bc	Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync	2026-04-17 08:00:03 +09:00
Mixer	0f173943ee	Sync 2026-04-17 08:00	2026-04-17 08:00:02 +09:00
Mixer	5428ccc4c2	Sync 2026-04-16 22:20	2026-04-16 22:20:04 +00:00
Mixer	d2f91e941c	Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync	2026-04-17 06:00:02 +09:00
Mixer	e0345a68fc	Sync 2026-04-17 06:00	2026-04-17 06:00:02 +09:00
Mixer	6fa45102ca	Sync 2026-04-16 20:20	2026-04-16 20:20:04 +00:00
Mixer	1dddeb3318	Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync	2026-04-17 04:00:03 +09:00
Mixer	b994fb85b8	Sync 2026-04-17 04:00	2026-04-17 04:00:02 +09:00
Mixer	148bec815b	Sync 2026-04-16 18:20	2026-04-16 18:20:04 +00:00
Mixer	64b344b64c	Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync	2026-04-17 02:00:02 +09:00
Mixer	59c6dd974b	Sync 2026-04-17 02:00	2026-04-17 02:00:02 +09:00
Mixer	58841a133b	Sync 2026-04-16 16:20	2026-04-16 16:20:04 +00:00
Mixer	55156989c8	Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync	2026-04-17 00:00:02 +09:00
Mixer	73a14eacb4	Sync 2026-04-17 00:00	2026-04-17 00:00:02 +09:00
Mixer	27050cd06c	Sync 2026-04-16 14:20	2026-04-16 14:20:04 +00:00
Mixer	d5a8d954a1	Merge branch 'main' of https://d.momix.cc/Mixer/hermes-sync	2026-04-16 22:51:50 +09:00
Mixer	b521283903	Sync 2026-04-16 22:51	2026-04-16 22:51:49 +09:00
Mixer	3caff4fa9f	Sync 2026-04-16 12:20	2026-04-16 12:20:03 +00:00
Mixer	5420ee1cb7	Sync 2026-04-16 10:20	2026-04-16 10:20:04 +00:00
Mixer	3a291d78af	Sync 2026-04-16 08:20	2026-04-16 08:20:04 +00:00
Mixer	9842015eaf	Sync 2026-04-16 06:20	2026-04-16 06:20:04 +00:00
Mixer	5e0603c079	Sync 2026-04-16 04:20	2026-04-16 04:20:03 +00:00
Mixer	efb2a4a1aa	Sync 2026-04-16 02:20	2026-04-16 02:20:04 +00:00
Mixer	374ea026e8	Sync 2026-04-16 00:20	2026-04-16 00:20:03 +00:00
Mixer	09286f5abd	Sync 2026-04-15 22:20	2026-04-15 22:20:04 +00:00
Mixer	a8390dc49c	Sync 2026-04-15 20:20	2026-04-15 20:20:03 +00:00
Mixer	5ef6acf77e	Sync 2026-04-15 18:20	2026-04-15 18:20:04 +00:00
Mixer	7660209de8	Sync 2026-04-15 16:20	2026-04-15 16:20:04 +00:00
Mixer	3df2174a4a	Sync 2026-04-15 14:20	2026-04-15 14:20:04 +00:00
Mixer	d079e0eb5f	Sync 2026-04-15 12:20	2026-04-15 12:20:04 +00:00
Mixer	70ebc57990	Sync 2026-04-15 10:20	2026-04-15 10:20:04 +00:00
Mixer	60e9188e53	Sync 2026-04-15 08:20	2026-04-15 08:20:04 +00:00
Mixer	649985db97	Sync 2026-04-15 06:20	2026-04-15 06:20:04 +00:00
Mixer	65fdd51495	Sync 2026-04-15 04:20	2026-04-15 04:20:04 +00:00
Mixer	5d0d72cbc4	Sync 2026-04-15 02:20	2026-04-15 02:20:03 +00:00
Mixer	7805305100	Sync 2026-04-15 00:20	2026-04-15 00:20:04 +00:00
Mixer	2a4cfcaee3	Sync 2026-04-14 22:20	2026-04-14 22:20:03 +00:00
Mixer	35e534e126	Sync 2026-04-14 20:20	2026-04-14 20:20:04 +00:00
Mixer	b64bbad44a	Sync 2026-04-14 18:20	2026-04-14 18:20:03 +00:00
Mixer	6c11196996	Sync 2026-04-14 16:20	2026-04-14 16:20:04 +00:00
Mixer	fcfb6af1eb	Sync 2026-04-14 14:20	2026-04-14 14:20:03 +00:00
Mixer	c8ea5a5aa5	Sync 2026-04-14 12:20	2026-04-14 12:20:04 +00:00
Mixer	0d46d4a900	Sync 2026-04-14 10:20	2026-04-14 10:20:04 +00:00
Mixer	1a34b59f42	Sync 2026-04-14 08:20	2026-04-14 08:20:05 +00:00
Mixer	5d6d6f32d7	Sync 2026-04-14 14:40	2026-04-14 14:40:03 +08:00
Mixer	5cec3fd321	Sync 2026-04-14 14:28	2026-04-14 14:28:33 +08:00
Mixer	47c609c886	Sync 2026-04-14 06:28	2026-04-14 06:28:27 +00:00
Mixer	781526de56	stop tracking state_merged.db (binary merge conflict)	2026-04-14 06:28:17 +00:00
Mixer	1c36b771ff	Sync 2026-04-14 06:27	2026-04-14 06:27:31 +00:00