projects
/
adaptation
/
intel_mfld
/
gst-plugins-atomisp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
eb48f7b
d1cadf1
)
Merge local branch
author
Telle-Tiia Pitkänen
<telle-tiia.pitkanen@ixonos.com>
Wed, 10 Apr 2013 10:41:10 +0000
(13:41 +0300)
committer
Telle-Tiia Pitkänen
<telle-tiia.pitkanen@ixonos.com>
Wed, 10 Apr 2013 10:43:36 +0000
(13:43 +0300)
Conflicts:
packaging/gst-plugins-atomisp.changes
Change-Id: I618b4221b162140d5cefb90fcee6363b5a8a4cda
Trivial merge