merge conflict solved

1 files changed, 2 insertions, 2 deletions

diff --git a/src/newt/classes/com/jogamp/newt/impl/x11/X11Window.java b/src/newt/classes/com/jogamp/newt/impl/x11/X11Window.java
index 80e5068b4..3b3cd07ae 100644
--- a/src/newt/classes/com/jogamp/newt/impl/x11/X11Window.java
+++ b/src/newt/classes/com/jogamp/newt/impl/x11/X11Window.java
@@ -105,7 +105,7 @@ public class X11Window extends WindowImpl {
 
     protected void reconfigureWindowImpl(int x, int y, int width, int height) {
         reconfigureWindow0(fullscreen?0:getParentWindowHandle(), getDisplayHandle(), getScreenIndex(), getWindowHandle(),
-                            x, y, width, height, isUndecorated(), isVisible());
+                           x, y, width, height, isUndecorated(), isVisible(), isFullscreen());
     }
 
     protected boolean reparentWindowImpl() {
@@ -136,7 +136,7 @@ public class X11Window extends WindowImpl {
     private        native void setVisible0(long display, long windowHandle, boolean visible);
     private        native void setSize0(long display, long windowHandle, int width, int height);
     private        native void reconfigureWindow0(long parentWindowHandle, long display, int screen_index, long windowHandle, 
-                                                  int x, int y, int width, int height, boolean undecorated, boolean isVisible);
+                                                  int x, int y, int width, int height, boolean undecorated, boolean isVisible, boolean fullscreen);
     private        native void setTitle0(long display, long windowHandle, String title);
     private        native void requestFocus0(long display, long windowHandle, boolean reparented);
     private        native void setPosition0(long parentWindowHandle, long display, long windowHandle, int x, int y);