Public Git Hosting - swfdec.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: f82ce69 a2429a1)

commit	cfe3e30d6bb53e86dddfb410cb1c7ef83b33cdb0
author	Benjamin Otte <otte@gnome.org>
	Sun, 21 Dec 2008 17:19:43 +0000 (21 18:19 +0100)
committer	Benjamin Otte <otte@gnome.org>
	Sun, 21 Dec 2008 17:19:43 +0000 (21 18:19 +0100)
tree	10f14f400790281222e3d156964f3f8c249f6b23	tree \| snapshot (tar.gz zip)
parent	f82ce694440e90e783af8f90e8e3f8bb9382bf66	commit \| diff
parent	a2429a12e00f13efecc6e6208a2c4cd3ef3b89b6	commit \| diff

Merge branch '0.8'

Conflicts:

NEWS
configure.ac

NEWS	diff1 \|	diff2 \|	blob \| history
test/swfdec_test.c	diff1 \|	diff2 \|	blob \| history

A decoder/renderer for Macromedia Flash animations.