[Orxonox-commit 2731] r7436 - sandbox_qt/src/orxonox
rgrieder at orxonox.net
rgrieder at orxonox.net
Sun Sep 12 22:59:09 CEST 2010
Author: rgrieder
Date: 2010-09-12 22:59:09 +0200 (Sun, 12 Sep 2010)
New Revision: 7436
Modified:
sandbox_qt/src/orxonox/MainWindow.cc
sandbox_qt/src/orxonox/MainWindow.h
sandbox_qt/src/orxonox/MainWindow.ui
Log:
svn:eol-style "native" for all test based files.
Modified: sandbox_qt/src/orxonox/MainWindow.cc
===================================================================
--- sandbox_qt/src/orxonox/MainWindow.cc 2010-09-12 20:56:19 UTC (rev 7435)
+++ sandbox_qt/src/orxonox/MainWindow.cc 2010-09-12 20:59:09 UTC (rev 7436)
@@ -1,37 +1,37 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Reto Grieder
- * Co-authors:
- * ...
- *
- */
-
-#include "MainWindow.h"
-
-namespace orxonox
-{
- MainWindow::MainWindow()
- {
- setupUi(this);
- }
-}
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Reto Grieder
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "MainWindow.h"
+
+namespace orxonox
+{
+ MainWindow::MainWindow()
+ {
+ setupUi(this);
+ }
+}
Property changes on: sandbox_qt/src/orxonox/MainWindow.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: sandbox_qt/src/orxonox/MainWindow.h
===================================================================
--- sandbox_qt/src/orxonox/MainWindow.h 2010-09-12 20:56:19 UTC (rev 7435)
+++ sandbox_qt/src/orxonox/MainWindow.h 2010-09-12 20:59:09 UTC (rev 7436)
@@ -1,48 +1,48 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Reto Grieder
- * Co-authors:
- * ...
- *
- */
-
-#ifndef _MainWindow_H__
-#define _MainWindow_H__
-
-#include "OrxonoxPrereqs.h"
-
-#include <QMainWindow>
-#include "orxonox/ui_MainWindow.h"
-
-namespace orxonox
-{
- class _OrxonoxExport MainWindow : public QMainWindow, private Ui::MainWindow
- {
- Q_OBJECT();
-
- public:
- MainWindow();
- };
-}
-
-#endif /* _MainWindow_H__ */
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Reto Grieder
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _MainWindow_H__
+#define _MainWindow_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include <QMainWindow>
+#include "orxonox/ui_MainWindow.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport MainWindow : public QMainWindow, private Ui::MainWindow
+ {
+ Q_OBJECT();
+
+ public:
+ MainWindow();
+ };
+}
+
+#endif /* _MainWindow_H__ */
Property changes on: sandbox_qt/src/orxonox/MainWindow.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: sandbox_qt/src/orxonox/MainWindow.ui
===================================================================
--- sandbox_qt/src/orxonox/MainWindow.ui 2010-09-12 20:56:19 UTC (rev 7435)
+++ sandbox_qt/src/orxonox/MainWindow.ui 2010-09-12 20:59:09 UTC (rev 7436)
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>800</width>
- <height>600</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>MainWindow</string>
- </property>
- <widget class="QWidget" name="centralwidget"/>
- <widget class="QMenuBar" name="menubar">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>800</width>
- <height>21</height>
- </rect>
- </property>
- </widget>
- <widget class="QStatusBar" name="statusbar"/>
- </widget>
- <resources/>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>800</width>
+ <height>600</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>MainWindow</string>
+ </property>
+ <widget class="QWidget" name="centralwidget"/>
+ <widget class="QMenuBar" name="menubar">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>800</width>
+ <height>21</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QStatusBar" name="statusbar"/>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
Property changes on: sandbox_qt/src/orxonox/MainWindow.ui
___________________________________________________________________
Added: svn:eol-style
+ native
More information about the Orxonox-commit
mailing list