Merge branch 'tizen' of git.vannes:/srv/git/gitcache/review.tizen.org//scm/bb/meta...
authorRonan Le Martret <ronan@fridu.net>
Fri, 25 Jul 2014 14:13:25 +0000 (16:13 +0200)
committerRonan Le Martret <ronan@fridu.net>
Fri, 25 Jul 2014 14:13:25 +0000 (16:13 +0200)
commit1b87ba7af780d25f6e9feb974e39a0d512481168
treeddfbb4b18a04eef6544043022afd703a4379b362
parent65bd0041da560c7ba9ede5e53c06b3f65d7906f2
parent4a3bb9ef968eff082e5b2536995dd9080be7fff5
Merge branch 'tizen' of git.vannes:/srv/git/gitcache/review.tizen.org//scm/bb/meta-tizen into tizen

Conflicts:
recipes-tizen/rpm/rpm-extraconf.inc

Change-Id: Ib44a1b0c91bfc4a969733ba909e1e7ad75f30624
recipes-tizen/crosswalk/crosswalk-extraconf.inc
recipes-tizen/rpm/rpm-extraconf.inc