Merge branch 'master' of ssh://165.213.149.219:29418/framework/uifw/emotion
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 14 Aug 2012 10:35:03 +0000 (19:35 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 14 Aug 2012 10:35:03 +0000 (19:35 +0900)
commit409cc26d26390887f069917138bdfe7620cffb00
tree28f9fcbf653b6871cf80f2cdd7e0e607c3c83ab6
parent0263ed924e548ee37f291cc08eeec68232f61050
parentb3c1b8db101e797cf89780956765e41f45ce4284
Merge branch 'master' of ssh://165.213.149.219:29418/framework/uifw/emotion

Conflicts:
ChangeLog
ChangeLog
NEWS
src/modules/gstreamer/emotion_sink.c