Merge branches 'HEAD' and 'tztv_2.2' kdbus-dev
authorSemun Lee <sm79.lee@samsung.com>
Wed, 15 Jan 2014 02:06:33 +0000 (11:06 +0900)
committerSemun Lee <sm79.lee@samsung.com>
Wed, 15 Jan 2014 02:06:33 +0000 (11:06 +0900)
commitf0b6f3fbf6125f3030b58376d524d70a4d5a5714
tree54f1c830e440fcbe20ce143112b7ece3ae588622
parent22c1109ea0496dc4047c09ae9b58c9c468dab6a8
parente3784c2b7bc51947be782eef5e7d60d218e70352
Merge branches 'HEAD' and 'tztv_2.2'