| commit | 779b4f1faedcea9b6717122adc169d56200b83f7 | |
| author | Benjamin Otte <otte@gnome.org> | |
| Wed, 12 Nov 2008 20:24:29 +0000 (12 21:24 +0100) | ||
| committer | Benjamin Otte <otte@gnome.org> | |
| Wed, 12 Nov 2008 20:24:29 +0000 (12 21:24 +0100) | ||
| tree | 654c341bf1fb3ec3284dc67619135bf878a22366 | treesnapshot (tar.gz zip) |
| parent | 143247067febe1d20f664488c841d462aa6dc0c5 | commitdiff |
| parent | 5195c41ab749afc8bdfaf1f2603281f23fc6a5d7 | commitdiff |
Merge branch '0.8'
Conflicts:
swfdec/swfdec_bitmap_data.c
Conflicts:
swfdec/swfdec_bitmap_data.c
| test/trace/Makefile.am | diff1 | diff2 | blobhistory |