Public Git Hosting - cinelerra

commit	a2b1433085e6d9cafce6e46092528d16c4508cf1
author	Christian Thaeter <ct@pipapo.org>
	Wed, 22 Aug 2007 05:29:14 +0000 (22 07:29 +0200)
committer	Christian Thaeter <ct@pipapo.org>
	Wed, 22 Aug 2007 05:29:14 +0000 (22 07:29 +0200)
tree	afd21f40db23bfdf9f45906dc3d6acd0cd072ba8	tree \| snapshot (tar.gz zip)
parent	5806816b20f2e98f3ce00b6259a057afd4c45be3	commit \| diff
parent	fee1e00cd2c8e764deb4839deacb68fea65a6369	commit \| diff

Merge branch 'widgetgrid' of git://git.pipapo.org/cinelerra/pmdumuid into ct

Conflicts:

cinelerra/fileyuv.C
cinelerra/pipe.C
guicast/bcrelocatablewidget.C
guicast/bcwidgetgrid.C
plugins/defaulttheme/data/Makefile.am
plugins/suv/data/Makefile.am

39 files changed:

cinelerra/bitspopup.C	diff1 \|	diff2 \|	blob \| history
cinelerra/bitspopup.h	diff1 \|	diff2 \|	blob \| history
cinelerra/fileac3.C	diff1 \|	diff2 \|	blob \| history
cinelerra/filedv.C	diff1 \|	diff2 \|	blob \| history
cinelerra/fileexr.C	diff1 \|	diff2 \|	blob \| history
cinelerra/filejpeg.C	diff1 \|	diff2 \|	blob \| history
cinelerra/filemov.C	diff1 \|	diff2 \|	blob \| history
cinelerra/filemov.h	diff1 \|	diff2 \|	blob \| history
cinelerra/filempeg.C	diff1 \|	diff2 \|	blob \| history
cinelerra/filempeg.h	diff1 \|	diff2 \|	blob \| history
cinelerra/filepng.C	diff1 \|	diff2 \|	blob \| history
cinelerra/filesndfile.C	diff1 \|	diff2 \|	blob \| history
cinelerra/filetga.C	diff1 \|	diff2 \|	blob \| history
cinelerra/filetiff.C	diff1 \|	diff2 \|	blob \| history
cinelerra/fileyuv.C	diff1 \|	diff2 \|	blob \| history
cinelerra/new.C	diff1 \|	diff2 \|	blob \| history
cinelerra/theme.C	diff1 \|	diff2 \|	blob \| history
cinelerra/theme.h	diff1 \|	diff2 \|	blob \| history
guicast/bcbutton.C	diff1 \|	diff2 \|	blob \| history
guicast/bcbutton.h	diff1 \|	diff2 \|	blob \| history
guicast/bcrelocatablewidget.C	diff1 \|	diff2 \|	blob \| history
guicast/bcrelocatablewidget.h	diff1 \|	diff2 \|	blob \| history
guicast/bcwidgetgrid.C	diff1 \|	diff2 \|	blob \| history
guicast/bcwidgetgrid.h	diff1 \|	diff2 \|	blob \| history
guicast/bcwindowbase.h	diff1 \|	diff2 \|	blob \| history
guicast/errorbox.C	diff1 \|	diff2 \|	blob \| history
plugins/1080to540/1080to540.C	diff1 \|	diff2 \|	blob \| history
plugins/720to480/720to480.C	diff1 \|	diff2 \|	blob \| history
plugins/bandslide/bandslide.C	diff1 \|	diff2 \|	blob \| history
plugins/bandwipe/bandwipe.C	diff1 \|	diff2 \|	blob \| history
plugins/bluedottheme/data/Makefile.am	diff1 \|	diff2 \|	blob \| history
plugins/bluedottheme/data/bg_general.png	\|	\|	blob
plugins/bluedottheme/data/bg_section.png	\|	\|	blob
plugins/bluedottheme/data/bg_sectiontxt.png	\|	\|	blob
plugins/bluedottheme/data/new_bg_tl.png	\|	\|	blob
plugins/chromakey/chromakey.C	diff1 \|	diff2 \|	blob \| history
plugins/defaulttheme/data/Makefile.am	diff1 \|	diff2 \|	blob \| history
plugins/defaulttheme/data/bg_general.png	\|	\|	blob
plugins/suv/data/Makefile.am	diff1 \|	diff2 \|	blob \| history

cehtehs branch of CinelerraCV

RSS Atom

cinelerra/bitspopup.C	diff1 \|	diff2 \|	blob \| history
cinelerra/bitspopup.h	diff1 \|	diff2 \|	blob \| history
cinelerra/fileac3.C	diff1 \|	diff2 \|	blob \| history
cinelerra/filedv.C	diff1 \|	diff2 \|	blob \| history
cinelerra/fileexr.C	diff1 \|	diff2 \|	blob \| history
cinelerra/filejpeg.C	diff1 \|	diff2 \|	blob \| history
cinelerra/filemov.C	diff1 \|	diff2 \|	blob \| history
cinelerra/filemov.h	diff1 \|	diff2 \|	blob \| history
cinelerra/filempeg.C	diff1 \|	diff2 \|	blob \| history
cinelerra/filempeg.h	diff1 \|	diff2 \|	blob \| history
cinelerra/filepng.C	diff1 \|	diff2 \|	blob \| history
cinelerra/filesndfile.C	diff1 \|	diff2 \|	blob \| history
cinelerra/filetga.C	diff1 \|	diff2 \|	blob \| history
cinelerra/filetiff.C	diff1 \|	diff2 \|	blob \| history
cinelerra/fileyuv.C	diff1 \|	diff2 \|	blob \| history
cinelerra/new.C	diff1 \|	diff2 \|	blob \| history
cinelerra/theme.C	diff1 \|	diff2 \|	blob \| history
cinelerra/theme.h	diff1 \|	diff2 \|	blob \| history
guicast/bcbutton.C	diff1 \|	diff2 \|	blob \| history
guicast/bcbutton.h	diff1 \|	diff2 \|	blob \| history
guicast/bcrelocatablewidget.C	diff1 \|	diff2 \|	blob \| history
guicast/bcrelocatablewidget.h	diff1 \|	diff2 \|	blob \| history
guicast/bcwidgetgrid.C	diff1 \|	diff2 \|	blob \| history
guicast/bcwidgetgrid.h	diff1 \|	diff2 \|	blob \| history
guicast/bcwindowbase.h	diff1 \|	diff2 \|	blob \| history
guicast/errorbox.C	diff1 \|	diff2 \|	blob \| history
plugins/1080to540/1080to540.C	diff1 \|	diff2 \|	blob \| history
plugins/720to480/720to480.C	diff1 \|	diff2 \|	blob \| history
plugins/bandslide/bandslide.C	diff1 \|	diff2 \|	blob \| history
plugins/bandwipe/bandwipe.C	diff1 \|	diff2 \|	blob \| history
plugins/bluedottheme/data/Makefile.am	diff1 \|	diff2 \|	blob \| history
plugins/bluedottheme/data/bg_general.png	\|	\|	blob
plugins/bluedottheme/data/bg_section.png	\|	\|	blob
plugins/bluedottheme/data/bg_sectiontxt.png	\|	\|	blob
plugins/bluedottheme/data/new_bg_tl.png	\|	\|	blob
plugins/chromakey/chromakey.C	diff1 \|	diff2 \|	blob \| history
plugins/defaulttheme/data/Makefile.am	diff1 \|	diff2 \|	blob \| history
plugins/defaulttheme/data/bg_general.png	\|	\|	blob
plugins/suv/data/Makefile.am	diff1 \|	diff2 \|	blob \| history