12 Commits

Author	SHA1	Message	Date
Kirill Bulatov	89e44d4901	Remove binary target collisions between zed & zed2	2023-11-17 09:56:28 +02:00
Mikayla	4de2c0f7ef	Re-implement actions as derive macros instead of blanket impls	2023-11-16 17:32:02 -08:00
Mikayla	3419aaf17e	Fix several shutdown related bugs	2023-11-14 11:42:58 -08:00
Mikayla	3050c440f4	Merge branch 'main' into add-collab-tests	2023-11-08 09:41:57 -08:00
Conrad Irwin	496518f3e8	Use gpui instead of gpui2 consistenytly	2023-11-06 11:50:33 -07:00
Mikayla	e1525e2b47	Get collab2 green	2023-11-03 18:01:06 -07:00
Mikayla	d11ff14b57	Remove the 2s from source code	2023-11-02 10:55:02 -07:00
Nathan Sobo	2079cd641e	Fix post-merge compile errors	2023-11-01 21:16:41 -06:00
Mikayla	6aaeb23157	Rename live kit bridge to 2	2023-11-01 10:52:15 -07:00
Mikayla	1568ecbe1e	Add back room code to call2	2023-11-01 09:29:54 -07:00
Mikayla	51fa80ef06	ported example app, live_kit_client2 is done	2023-11-01 09:19:32 -07:00
Mikayla	244e8ce101	WIP - make livekit work in GPUI2	2023-10-31 14:04:03 -07:00