projects / adaptation / intel_mfld / gst-plugins-atomisp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa36bb9 cfc246a)
Merge branch master into tizen_2.1
authorTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Tue, 16 Apr 2013 11:24:20 +0000 (14:24 +0300)
committerTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Tue, 16 Apr 2013 11:24:20 +0000 (14:24 +0300)
Conflicts:
packaging/gst-plugins-atomisp.changes

Change-Id: Ibbf47e7837b0ec92f03c787b39e6eb0600a9ad07


Trivial merge
Domain: Multimedia / Media Playback;