Merge branch 'playbin'
commit4cc235b5b3aada8b1437024249025ac3d13b6cf9
authorDouglas Bagnall <douglas@paradise.net.nz>
Wed, 2 Feb 2011 10:02:22 +0000 (2 23:02 +1300)
committerDouglas Bagnall <douglas@paradise.net.nz>
Wed, 2 Feb 2011 10:02:22 +0000 (2 23:02 +1300)
tree90035104f03c558ec0b34e336da19de42c415405
parent0bb92c49f0436ac6240dfc75aaa9d6a6d3e110a7
parent372d1b00a1a0002a09bfd05cdb003729a7cb24ec
Merge branch 'playbin'
gtk-app.c