Merge branch 'tizen' into devel/new_mesh 89/37589/2
authorDavid Steele <david.steele@partner.samsung.com>
Tue, 31 Mar 2015 13:16:12 +0000 (14:16 +0100)
committerDavid Steele <david.steele@partner.samsung.com>
Tue, 31 Mar 2015 16:05:36 +0000 (17:05 +0100)
commite54d4d1af5dfd8eeaa591f177367cff25cfeb8b2
tree79eca341d7ff4a3754e514d67f3bb594c39d162c
parent6d56a8e211df2cef1075278543a52215eef9935c
parentc380151ec7ea59444f649e8054c400e259efd79c
Merge branch 'tizen' into devel/new_mesh
.

Change-Id: Ic6d3c6e1cc6dff2dbf9064797e766ed88ec3deaa
build/tizen/adaptor/Makefile.am
build/tizen/configure.ac