From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Tue, 10 Jun 2014 02:11:24 +0000 (-0700)
Subject: Merge changes I3460bcc2,Ie04d92a0 into tizen
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~352
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=088b0aeb662239cdb5c3067714d6e52394311cab;p=sdk%2Femulator%2Fqemu.git

Merge changes I3460bcc2,Ie04d92a0 into tizen

* changes:
  display: modified varable name
  screenshot: modified function/varable names
---

088b0aeb662239cdb5c3067714d6e52394311cab
diff --cc tizen/src/skin/maruskin_server.h
index 3430fcdc7f,17aafd4866..54a4cf723f
--- a/tizen/src/skin/maruskin_server.h
+++ b/tizen/src/skin/maruskin_server.h
@@@ -35,10 -35,12 +35,10 @@@ void shutdown_skin_server(void)
  
  void notify_draw_frame(void);
  void notify_draw_blank_guide(void);
 -void notify_ecs_server_start(void);
  void notify_sdb_daemon_start(void);
 -void notify_sensor_daemon_start(void);
  void notify_ramdump_completed(void);
  void notify_booting_progress(unsigned int layer, int progress_value);
- void notify_brightness_state(bool on);
+ void notify_display_power(bool on);
  void notify_host_kbd_state(bool on);
  void notify_multi_touch_state(bool on);
  void notify_emul_reset(void);