Merge branch 'master' of github.com:eurogiciel-oss/meta-tizen
authorRonan Le Martret <ronan@fridu.net>
Tue, 13 May 2014 08:52:07 +0000 (10:52 +0200)
committerRonan Le Martret <ronan@fridu.net>
Tue, 13 May 2014 08:52:07 +0000 (10:52 +0200)
commit2d6b7c46d8cdb2bbb5fb423b98a6e9f579a0c3c4
tree49259561fab1d1a96ba3c6f08667fa7e7816b494
parentc40fefd2a54f7dfdfea99a955b8ab22eab9af578
parent27de70a50d3278d0ed0b74e613562959ad16996c
Merge branch 'master' of github.com:eurogiciel-oss/meta-tizen

Conflicts:
recipes-tizen/librua/librua.inc

Change-Id: I1917809ca8d77c96f1704166fcc7248e895f02a0