Merge remote branch 'origin/gallium-0.1' into nouveau-gallium-0.1

8 files changed, 0 insertions, 8 deletions

diff --git a/src/glut/os2/WarpWin.cpp b/src/glut/os2/WarpWin.cpp
index bd5a6e80c7f..71cc8e1bc9c 100644
--- a/src/glut/os2/WarpWin.cpp
+++ b/src/glut/os2/WarpWin.cpp
@@ -417,4 +417,3 @@ void ScreenToClient( HWND hwnd,   POINTL *point)
   point->y -= swp_src.y;
 }
 
-
\ No newline at end of file
diff --git a/src/glut/os2/glut_cindex.cpp b/src/glut/os2/glut_cindex.cpp
index 34841850519..fa6d2f12d65 100644
--- a/src/glut/os2/glut_cindex.cpp
+++ b/src/glut/os2/glut_cindex.cpp
@@ -256,4 +256,3 @@ bla bla bla
 #endif
 }
 /* ENDCENTRY */
-
\ No newline at end of file
diff --git a/src/glut/os2/glut_gamemode.cpp b/src/glut/os2/glut_gamemode.cpp
index 39918fdf39b..1756e8a4b56 100644
--- a/src/glut/os2/glut_gamemode.cpp
+++ b/src/glut/os2/glut_gamemode.cpp
@@ -677,4 +677,3 @@ glutGameModeGet(GLenum mode)
     return -1;
   }
 }
-
\ No newline at end of file
diff --git a/src/glut/os2/glut_win.cpp b/src/glut/os2/glut_win.cpp
index 53ff5d5d953..63757d71522 100644
--- a/src/glut/os2/glut_win.cpp
+++ b/src/glut/os2/glut_win.cpp
@@ -1218,4 +1218,3 @@ glutReshapeFunc(GLUTreshapeCB reshapeFunc)
     __glutCurrentWindow->reshape = __glutDefaultReshape;
   }
 }
-
\ No newline at end of file
diff --git a/src/glut/os2/glut_winmisc.cpp b/src/glut/os2/glut_winmisc.cpp
index 456d19a8c18..7cd6699924f 100644
--- a/src/glut/os2/glut_winmisc.cpp
+++ b/src/glut/os2/glut_winmisc.cpp
@@ -124,4 +124,3 @@ glutHideWindow(void)
 }
 
 /* ENDCENTRY */
-
\ No newline at end of file
diff --git a/src/glut/os2/os2_glx.cpp b/src/glut/os2/os2_glx.cpp
index 5e135bc17e9..bf116e49c9f 100644
--- a/src/glut/os2/os2_glx.cpp
+++ b/src/glut/os2/os2_glx.cpp
@@ -143,4 +143,3 @@ XVisualInfo * glXChooseVisual(int mode)
 #if POKA
 #endif /* POKA */
 
-
\ No newline at end of file
diff --git a/src/glut/os2/os2_menu.cpp b/src/glut/os2/os2_menu.cpp
index 56f2cdef8b2..f140e9c79b0 100644
--- a/src/glut/os2/os2_menu.cpp
+++ b/src/glut/os2/os2_menu.cpp
@@ -530,4 +530,3 @@ glutDetachMenu(int button)
   }
 }
 
-
\ No newline at end of file
diff --git a/src/glut/os2/os2_winproc.cpp b/src/glut/os2/os2_winproc.cpp
index 6ffe0d4624b..9cbdec1cd29 100644
--- a/src/glut/os2/os2_winproc.cpp
+++ b/src/glut/os2/os2_winproc.cpp
@@ -1294,4 +1294,3 @@ Bool __glutSetWindowText(Window window, char *text)
 }
 
 #endif
-
\ No newline at end of file