From: Sangho Park <sangho1206.park@samsung.com>
Date: Sun, 6 Jul 2014 06:56:19 +0000 (-0700)
Subject: Merge "emulator: some error reporting routine is refactored" into tizen
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~228^2^2~83
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ac4a925ebad133a1484b0a5e2a37a8e81c3eac1c;p=sdk%2Femulator%2Fqemu.git

Merge "emulator: some error reporting routine is refactored" into tizen
---

ac4a925ebad133a1484b0a5e2a37a8e81c3eac1c
diff --cc tizen/src/emulator.c
index 3c269f587e,2243b3ef47..d02d065263
--- a/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@@ -38,8 -38,9 +38,8 @@@
  #include "emulator.h"
  #include "emul_state.h"
  #include "emulator_options.h"
 -#include "util/sdb_noti_server.h"
  #include "util/check_gl.h"
- #include "maru_err_table.h"
+ #include "util/maru_err_table.h"
  #include "util/osutil.h"
  #include "util/sdb.h"
  #include "skin/maruskin_server.h"