Fix the conflict changes. 76/50176/1
authorSung-jae Park <nicesj.park@samsung.com>
Mon, 26 Oct 2015 12:45:10 +0000 (21:45 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Mon, 26 Oct 2015 12:45:50 +0000 (21:45 +0900)
commit285f479f11b4b2d8e52fcf9ebba24af920e76d20
treebf0b667037c1711bd9e2faee3a232a86ffb55fab
parent2ab79e2e01eda2f7cc91d94f441d123dd3ecc4df
Fix the conflict changes.

Change-Id: I9648d75d0446ca80e25a5460c0df30112f224f36
20 files changed:
TelegramTizen/inc/tg_audio_player.h [new file with mode: 0644]
TelegramTizen/res/edje/telegram_init_screen.edc
TelegramTizen/res/edje/telegram_theme.edc
TelegramTizen/res/images/telegram_audio_player_pause_dim.png [new file with mode: 0644]
TelegramTizen/res/images/telegram_audio_player_pause_normal.png [new file with mode: 0644]
TelegramTizen/res/images/telegram_audio_player_pause_press.png [new file with mode: 0644]
TelegramTizen/res/images/telegram_audio_player_play_dim.png [new file with mode: 0644]
TelegramTizen/res/images/telegram_audio_player_play_normal.png [new file with mode: 0644]
TelegramTizen/res/images/telegram_audio_player_play_press.png [new file with mode: 0644]
TelegramTizen/res/images/telegram_icon_expand_close.png [new file with mode: 0644]
TelegramTizen/res/images/telegram_icon_expand_open.png [new file with mode: 0644]
TelegramTizen/src/telegramtizen.c
TelegramTizen/src/tg_audio_player.c [new file with mode: 0644]
TelegramTizen/src/tg_messaging_view.c
TelegramTizen/src/tg_settings_view.c
TelegramTizen/src/tg_user_main_view.c
TelegramTizen/tg_utils/tg_common.h
tg-engine-service/inc/tg_db_wrapper.h
tg-engine-service/src/tg_db_wrapper.c
tg-engine-service/tg_engine/tg_engine.c