Merge remote branch 'qtmultimedia.git/master'

Browse Source

This replaces the qtmultimedia.git contents with qtmultimediakit.git's
contents (as a merge with -s ours, when run against qtmmk).

Change-Id: I940f84fb09285eb7e37d0aaac07ccc4f3165b04f

...

This commit is contained in:

Michael Goddard

2011-10-26 10:33:50 +10:00

parent e038257048 e7bda0c3bf

commit b9fd2c65e1

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available