[Orxonox-commit 3626] r8311 - in code/branches/kicklib2: bin cmake contrib data/levels data/mac data/mac/English.lproj data/mac/English.lproj/MainMenu.nib data/overlays doc/api/groups src src/libraries/network src/libraries/network/packet src/modules/overlays/hud src/modules/questsystem/effects src/orxonox/gametypes src/orxonox/interfaces
rgrieder at orxonox.net
rgrieder at orxonox.net
Sat Apr 23 01:26:52 CEST 2011
Author: rgrieder
Date: 2011-04-23 01:26:52 +0200 (Sat, 23 Apr 2011)
New Revision: 8311
Modified:
code/branches/kicklib2/bin/masterserver.bat.in
code/branches/kicklib2/bin/masterserver.in
code/branches/kicklib2/cmake/BundleConfig.cmake
code/branches/kicklib2/cmake/PrepareDevBundle.cmake
code/branches/kicklib2/contrib/CMakeLists.txt
code/branches/kicklib2/contrib/orxonox.desktop
code/branches/kicklib2/contrib/orxonox.manpage.xml
code/branches/kicklib2/data/levels/lastTeamStandingII.oxw
code/branches/kicklib2/data/levels/planets.oxw
code/branches/kicklib2/data/mac/English.lproj/InfoPlist.strings
code/branches/kicklib2/data/mac/English.lproj/MainMenu.nib/designable.nib
code/branches/kicklib2/data/mac/English.lproj/MainMenu.xib
code/branches/kicklib2/data/mac/Orxonox-Info.plist
code/branches/kicklib2/data/overlays/lastTeamStandingHUD.oxo
code/branches/kicklib2/doc/api/groups/Notifications.dox
code/branches/kicklib2/doc/api/groups/Pickup.dox
code/branches/kicklib2/doc/api/groups/Questsystem.dox
code/branches/kicklib2/doc/api/groups/Triggers.dox
code/branches/kicklib2/src/OrxonoxMac.h
code/branches/kicklib2/src/OrxonoxMac.mm
code/branches/kicklib2/src/libraries/network/LANDiscoverable.cc
code/branches/kicklib2/src/libraries/network/LANDiscoverable.h
code/branches/kicklib2/src/libraries/network/LANDiscovery.cc
code/branches/kicklib2/src/libraries/network/LANDiscovery.h
code/branches/kicklib2/src/libraries/network/MasterServer.cc
code/branches/kicklib2/src/libraries/network/MasterServer.h
code/branches/kicklib2/src/libraries/network/MasterServerComm.cc
code/branches/kicklib2/src/libraries/network/MasterServerComm.h
code/branches/kicklib2/src/libraries/network/MasterServerProtocol.h
code/branches/kicklib2/src/libraries/network/PeerList.cc
code/branches/kicklib2/src/libraries/network/PeerList.h
code/branches/kicklib2/src/libraries/network/ServerList.cc
code/branches/kicklib2/src/libraries/network/ServerList.h
code/branches/kicklib2/src/libraries/network/WANDiscoverable.cc
code/branches/kicklib2/src/libraries/network/WANDiscoverable.h
code/branches/kicklib2/src/libraries/network/WANDiscovery.cc
code/branches/kicklib2/src/libraries/network/WANDiscovery.h
code/branches/kicklib2/src/libraries/network/packet/ServerInformation.cc
code/branches/kicklib2/src/libraries/network/packet/ServerInformation.h
code/branches/kicklib2/src/modules/overlays/hud/LastTeamStandingInfos.cc
code/branches/kicklib2/src/modules/questsystem/effects/CMakeLists.txt
code/branches/kicklib2/src/orxonox/gametypes/LastTeamStanding.cc
code/branches/kicklib2/src/orxonox/gametypes/LastTeamStanding.h
code/branches/kicklib2/src/orxonox/interfaces/PickupCarrier.cc
code/branches/kicklib2/src/orxonox/interfaces/PickupListener.cc
code/branches/kicklib2/src/orxonox/interfaces/PickupListener.h
Log:
svn:eol-style "native" for all text based files.
Also removed the executable property from planets.oxw.
Property changes on: code/branches/kicklib2/bin/masterserver.bat.in
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/bin/masterserver.in
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/cmake/BundleConfig.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/cmake/PrepareDevBundle.cmake
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/kicklib2/contrib/CMakeLists.txt
===================================================================
--- code/branches/kicklib2/contrib/CMakeLists.txt 2011-04-22 21:06:39 UTC (rev 8310)
+++ code/branches/kicklib2/contrib/CMakeLists.txt 2011-04-22 23:26:52 UTC (rev 8311)
@@ -1,30 +1,30 @@
- #
- # ORXONOX - the hottest 3D action shooter ever to exist
- # > www.orxonox.net <
- #
- # 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
- # Description:
- # Installs system specific files
- #
-
-IF(UNIX AND NOT APPLE)
- INSTALL(FILES orxonox.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
- #INSTALL(FILES orxonox.manpage.xml DESTINATION /usr/man)
- INSTALL(FILES orxonox.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)
-ENDIF()
+ #
+ # ORXONOX - the hottest 3D action shooter ever to exist
+ # > www.orxonox.net <
+ #
+ # 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
+ # Description:
+ # Installs system specific files
+ #
+
+IF(UNIX AND NOT APPLE)
+ INSTALL(FILES orxonox.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+ #INSTALL(FILES orxonox.manpage.xml DESTINATION /usr/man)
+ INSTALL(FILES orxonox.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)
+ENDIF()
Property changes on: code/branches/kicklib2/contrib/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/contrib/orxonox.desktop
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/contrib/orxonox.manpage.xml
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/data/levels/lastTeamStandingII.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/data/levels/planets.oxw
___________________________________________________________________
Deleted: svn:executable
- *
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/data/mac/English.lproj/InfoPlist.strings
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/data/mac/English.lproj/MainMenu.nib/designable.nib
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/data/mac/English.lproj/MainMenu.xib
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/data/mac/Orxonox-Info.plist
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/data/overlays/lastTeamStandingHUD.oxo
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/doc/api/groups/Notifications.dox
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/doc/api/groups/Pickup.dox
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/doc/api/groups/Questsystem.dox
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/doc/api/groups/Triggers.dox
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/OrxonoxMac.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/OrxonoxMac.mm
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/libraries/network/LANDiscoverable.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/libraries/network/LANDiscoverable.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/libraries/network/LANDiscovery.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/libraries/network/LANDiscovery.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/libraries/network/MasterServer.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/libraries/network/MasterServer.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/libraries/network/MasterServerComm.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/libraries/network/MasterServerComm.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/libraries/network/MasterServerProtocol.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/libraries/network/PeerList.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/libraries/network/PeerList.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/libraries/network/ServerList.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/libraries/network/ServerList.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/libraries/network/WANDiscoverable.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/libraries/network/WANDiscoverable.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/libraries/network/WANDiscovery.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/libraries/network/WANDiscovery.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/libraries/network/packet/ServerInformation.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/libraries/network/packet/ServerInformation.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/modules/overlays/hud/LastTeamStandingInfos.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/modules/questsystem/effects/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/orxonox/gametypes/LastTeamStanding.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/orxonox/gametypes/LastTeamStanding.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/orxonox/interfaces/PickupCarrier.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/orxonox/interfaces/PickupListener.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/branches/kicklib2/src/orxonox/interfaces/PickupListener.h
___________________________________________________________________
Added: svn:eol-style
+ native
More information about the Orxonox-commit
mailing list