From: Jaehwan Kim <jae.hwan.kim@samsung.com>
Date: Wed, 1 Aug 2012 10:59:18 +0000 (+0900)
Subject: Solve conflict
X-Git-Tag: 2.0_alpha~13
X-Git-Url: http://review.tizen.org/git/?p=framework%2Fuifw%2Fevas.git;a=commitdiff_plain;h=9089cdab18fd94f7d8f6c5d36bc699018bfc8ef6

Solve conflict

Conflicts:

	src/modules/engines/gl_x11/evas_engine.c

Change-Id: Ifde663f25f1279ff9a9b78e324a1600ea5aa51af
---

diff --git a/src/modules/engines/gl_x11/evas_engine.c b/src/modules/engines/gl_x11/evas_engine.c
index d1df85d..886331a 100755
--- a/src/modules/engines/gl_x11/evas_engine.c
+++ b/src/modules/engines/gl_x11/evas_engine.c
@@ -3432,7 +3432,7 @@ _attach_fbo_surface(Render_Engine *data __UNUSED__,
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
         glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_STENCIL_OES, sfc->w, sfc->h,
                      0, GL_DEPTH_STENCIL_OES, GL_UNSIGNED_INT_24_8_OES, NULL);
-       if (sfc->rt_msaa_samples)
+        if (sfc->rt_msaa_samples)
           {
              glsym_glFramebufferTexture2DMultisample(GL_FRAMEBUFFER,
                                                      GL_DEPTH_ATTACHMENT,