Merge branch 'wrt-devel' of ssh://5.39.65.177/home/yoctotizen/yocto/yoctoTizen into...
authorRonan Le Martret <ronan@fridu.net>
Tue, 3 Sep 2013 13:50:01 +0000 (15:50 +0200)
committerRonan Le Martret <ronan@fridu.net>
Tue, 3 Sep 2013 13:50:01 +0000 (15:50 +0200)
commit976e8eef6f1b38dbfadb52f1708f4555b3b22550
tree5dd13f5f6fa26477fbba7b70ca5c726fc6745dbf
parent32e8a8325a619c19816adf03e26b23925886c3ce
parent5c4662c7c6dc1d163989346002192b5adae6b19c
Merge branch 'wrt-devel' of ssh://5.39.65.177/home/yoctotizen/yocto/yoctoTizen into wrt-devel

Conflicts:
meta-wrt-tizen/conf/layer.conf