Merge from ship-simu trunk

[hub.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index f2cc2248dcf256f0238f53a7c1b084657fdd1fb6..ad4c031ca0cc9feb729ba331d33f89461d415a38 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -47,9 +47,15 @@ db/SimulatorPersonell/829292aeca3f6bf78c16e25fc4f75c98.serialized -text
 devel/.htaccess -text
 devel/class_Debug.php -text
 docs/COPYING -text
+docs/COPYING.documents -text
+docs/COPYING.software -text
+docs/Conception[!!-~]-[!!-~]Ship-Simu[!!-~]0.0.1.odt -text
 docs/NEWS -text
 docs/README -text
+docs/Ship-Simu[!!-~]ArgoUML[!!-~]Diagram.zargo -text
+docs/Ship-Simu[!!-~]Ship-Simulator.mm -text
 docs/THANKS -text
+docs/mindmap_20080517.html -text
 inc/.htaccess -text
 inc/classes.php -text
 inc/classes/.htaccess -text
@@ -166,6 +172,8 @@ inc/classes/main/commands/.htaccess -text
 inc/classes/main/commands/class_BaseCommand.php -text
 inc/classes/main/commands/local/.htaccess -text
 inc/classes/main/commands/local/class_LocalHomeCommand.php -text
+inc/classes/main/commands/web/.htaccess -text
+inc/classes/main/commands/web/class_WebHomeCommand.php -text
 inc/classes/main/compressor/.htaccess -text
 inc/classes/main/compressor/class_Bzip2Compressor.php -text
 inc/classes/main/compressor/class_GzipCompressor.php -text
@@ -178,6 +186,8 @@ inc/classes/main/controller/class_BaseController.php -text
 inc/classes/main/controller/default/.htaccess -text
 inc/classes/main/controller/default/class_LocalDefaultController.php -text
 inc/classes/main/controller/default/class_LocalDefaultNewsController.php -text
+inc/classes/main/controller/default/class_WebDefaultController.php -text
+inc/classes/main/controller/default/class_WebDefaultNewsController.php -text
 inc/classes/main/controller/registration/.htaccess -text
 inc/classes/main/controller/registration/class_DefaultRegistrationController.php -text
 inc/classes/main/database/.htaccess -text
@@ -191,6 +201,12 @@ inc/classes/main/debug/class_DebugWebOutput.php -text
 inc/classes/main/extended/.htaccess -text
 inc/classes/main/extended/class_ObjectLimits.php -text
 inc/classes/main/extended/class_SerializationContainer.php -text
+inc/classes/main/factories/.htaccess -text
+inc/classes/main/factories/class_BaseFactory.php -text
+inc/classes/main/factories/objects/.htaccess -text
+inc/classes/main/factories/objects/class_ObjectFactory.php -text
+inc/classes/main/factories/web/.htaccess -text
+inc/classes/main/factories/web/class_NewsFactory.php -text
 inc/classes/main/io/.htaccess -text
 inc/classes/main/io/class_FileIOStream.php -text
 inc/classes/main/io/class_FrameworkDirectoryPointer.php -text
@@ -208,6 +224,9 @@ inc/classes/main/resolver/class_BaseResolver.php -text
 inc/classes/main/resolver/local/.htaccess -text
 inc/classes/main/resolver/local/class_LocalCommandResolver.php -text
 inc/classes/main/resolver/local/class_LocalControllerResolver.php -text
+inc/classes/main/resolver/web/.htaccess -text
+inc/classes/main/resolver/web/class_WebCommandResolver.php -text
+inc/classes/main/resolver/web/class_WebControllerResolver.php -text
 inc/classes/main/response/.htaccess -text
 inc/classes/main/response/class_HttpResponse.php -text
 inc/classes/main/template/.htaccess -text
@@ -225,6 +244,7 @@ inc/classes/middleware/io/class_FileIOHandler.php -text
 inc/config.php -text
 inc/config/.htaccess -text
 inc/config/class_FrameworkConfiguration.php -text
+inc/config/config-hubmaster.php -text
 inc/config/config-override.php -text
 inc/database.php -text
 inc/database/.htaccess -text