The open-source CapCut alternative
Merge branch 'main' into split-issue-83
Priyankar Palc322ad1124ae
diff --cc apps/web/src/components/editor/timeline.tsxindex 7d3c85fb,c1b8f3e8..591eac89--- a/apps/web/src/components/editor/timeline.tsx+++ b/apps/web/src/components/editor/timeline.tsx@@@ -29,13 -35,8 +29,17 @@@ importSelectTrigger,SelectValue,} from "../ui/select";+++import {+ Tooltip,+ TooltipContent,+ TooltipProvider,+ TooltipTrigger,+} from "../ui/tooltip";++ import AudioWaveform from "./audio-waveform";+++export function Timeline() {// Timeline shows all tracks (video, audio, effects) and their clips.// You can drag media here to add it to your project.