From: sungmin ha <sungmin82.ha@samsung.com>
Date: Fri, 10 Aug 2012 12:14:04 +0000 (+0900)
Subject: Merge remote-tracking branch 'remotes/private-qm/develop' into develop
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1528
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f4bc6321a9ae5332b2fcec96a91885e3af200245;p=sdk%2Femulator%2Fqemu.git

Merge remote-tracking branch 'remotes/private-qm/develop' into develop
---

f4bc6321a9ae5332b2fcec96a91885e3af200245
diff --cc tizen/src/maru_err_table.h
index 491bd01584,6d127bbbaa..ff27db4339
--- a/tizen/src/maru_err_table.h
+++ b/tizen/src/maru_err_table.h
@@@ -3,7 -3,7 +3,11 @@@
   *
   * Copyright (C) 2011, 2012 Samsung Electronics Co., Ltd. All rights reserved.
   *
++<<<<<<< HEAD
 + * Contact: 
++=======
+  * Contact:
++>>>>>>> remotes/private-qm/develop
   * SeokYeon Hwang <syeon.hwang@samsung.com>
   * GiWoong Kim <giwoong.kim@samsung.com>
   * YeongKyoon Lee <yeongkyoon.lee@samsung.com>
@@@ -20,7 -20,8 +24,12 @@@
   *
   * You should have received a copy of the GNU General Public License
   * along with this program; if not, write to the Free Software
++<<<<<<< HEAD
 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
++=======
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+  * MA 02110-1301, USA.
++>>>>>>> remotes/private-qm/develop
   *
   * Contributors:
   * - S-Core Co., Ltd
@@@ -35,8 -36,8 +44,13 @@@
  
  
  /* TODO: define macro for fair of definition */
++<<<<<<< HEAD
 +
 +enum { //This enum must match the table definition
++=======
+ /* This enum must match the table definition */
+ enum {
++>>>>>>> remotes/private-qm/develop
      /* 0 */ MARU_EXIT_UNKNOWN = 0,
      /* 1 */ MARU_EXIT_MEMORY_EXCEPTION,
      /* 2 */ MARU_EXIT_KERNEL_FILE_EXCEPTION,
@@@ -47,9 -48,9 +61,16 @@@
  };
  
  
++<<<<<<< HEAD
 +void maru_register_exit_msg(int maru_exit_status, char* additional_msg);
 +void maru_atexit(void);
 +char* maru_convert_path(char *msg, const char *path);
 +void maru_dump_backtrace(void* ptr, int depth);
++=======
+ void maru_register_exit_msg(int maru_exit_status, char *additional_msg);
+ void maru_atexit(void);
+ char *maru_convert_path(char *msg, const char *path);
+ void maru_dump_backtrace(void *ptr, int depth);
++>>>>>>> remotes/private-qm/develop
  
  #endif /* __EMUL_ERR_TABLE_H__ */