Merge branch 'devel-crosswalk' of git.vannes:/srv/git/gitcache/github.com/eurogiciel...
authorRonan Le Martret <ronan@fridu.net>
Tue, 13 May 2014 09:43:26 +0000 (11:43 +0200)
committerRonan Le Martret <ronan@fridu.net>
Tue, 13 May 2014 09:43:26 +0000 (11:43 +0200)
commit560fad1cd59209964ef0c2d57ff211075ffa4563
tree6d0f9df03d6cffc90dd4e5f33ca7494932647c2c
parentad77322c5fbbd0dd31d12099198eb0771e09a517
parentfb54bbbbef87a37b09b70fabca56aed8baabf9dc
Merge branch 'devel-crosswalk' of git.vannes:/srv/git/gitcache/github.com/eurogiciel-oss/yoctoTizen into devel-crosswalk

Conflicts:
proto-meta-Tizen_generic/.spec2yoctorc

Change-Id: I9946fd408ee6babb56344de4fee14c28bf5ad830
proto-meta-Tizen_generic/.spec2yoctorc