Merge branch 'devel'
authorKévin THIERRY <kevin.thierry@open.eurogiciel.org>
Mon, 28 Apr 2014 14:14:15 +0000 (16:14 +0200)
committerKévin THIERRY <kevin.thierry@open.eurogiciel.org>
Mon, 28 Apr 2014 14:14:15 +0000 (16:14 +0200)
commit0c349d3e10eb052fc5a177c816231c244e122d13
treee4c4aeb80af09b1baacd5aa9e162555ce980bcab
parent0125da709ffaf8938871d71509c985e92ec35f84
parentb6ebe6ef6937a95c4fd1c3814d420ccc4f619ca9
Merge branch 'devel'

Conflicts:
README
documentation/Tizen_wrt/tizen_wrt.txt