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:
cbe8561
bafaf9b
)
Merge branch 'master' into tizen_2.1
author
Telle-Tiia Pitkänen
<telle-tiia.pitkanen@ixonos.com>
Wed, 20 Mar 2013 10:52:55 +0000
(12:52 +0200)
committer
Telle-Tiia Pitkänen
<telle-tiia.pitkanen@ixonos.com>
Wed, 20 Mar 2013 10:52:55 +0000
(12:52 +0200)
Conflicts:
.gitignore
Change-Id: If3f5be7e4ca372bf4f4ea48aa44d3c53dd2b3b0e
Trivial merge