From: <de...@us...> - 2009-01-14 05:01:02
|
Revision: 4354 http://fudaa.svn.sourceforge.net/fudaa/?rev=4354&view=rev Author: deniger Date: 2009-01-14 05:00:56 +0000 (Wed, 14 Jan 2009) Log Message: ----------- merge trunk Property Changed: ---------------- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrIsoLineAction.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostCourbeAddPointsAction.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostProfileAction.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostVolumeAction.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreated.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedConstant.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedCstTime.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedCstTimeSaver.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedDefault.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedExpr.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedFroud.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedImport.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedMoins.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedNorm.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedNorme3D.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPlus.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedRubarBathy.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedRubarVitesse.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedSaver.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedStatistic.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedStatisticSaver.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreationActions.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreationFille.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreationPanel.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditCommonPanel.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditCstPanel.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditExprPanel.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditStatisticPanel.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataInfoDoc.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataListener.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataMinMaxGlobalItem.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataUserVarModel.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataVecteur.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostExtremVisitor.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostTrajectoireTaskModel.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardImportScope.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardProfilSpatial.java Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrIsoLineAction.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrIsoLineAction.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostCourbeAddPointsAction.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostCourbeAddPointsAction.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostProfileAction.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostProfileAction.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostVolumeAction.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/actions/TrPostVolumeAction.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreated.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreated.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedConstant.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedConstant.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedCstTime.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedCstTime.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedCstTimeSaver.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedCstTimeSaver.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedDefault.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedDefault.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedExpr.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedExpr.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedFroud.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedFroud.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedImport.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedImport.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedMoins.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedMoins.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedNorm.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedNorm.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedNorme3D.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedNorme3D.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPlus.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPlus.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedRubarBathy.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedRubarBathy.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedRubarVitesse.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedRubarVitesse.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedSaver.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedSaver.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedStatistic.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedStatistic.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedStatisticSaver.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedStatisticSaver.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreationActions.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreationActions.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreationFille.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreationFille.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreationPanel.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataCreationPanel.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditCommonPanel.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditCommonPanel.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditCstPanel.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditCstPanel.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditExprPanel.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditExprPanel.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditStatisticPanel.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataEditStatisticPanel.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataInfoDoc.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataInfoDoc.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataListener.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataListener.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataMinMaxGlobalItem.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataMinMaxGlobalItem.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataUserVarModel.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataUserVarModel.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataVecteur.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostDataVecteur.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostExtremVisitor.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/data/TrPostExtremVisitor.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostTrajectoireTaskModel.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostTrajectoireTaskModel.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardCourbeTemporelle.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardImportScope.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardImportScope.java:1912-4350 Property changes on: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardProfilSpatial.java ___________________________________________________________________ Modified: svn:mergeinfo - + /trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/dialogSpec/TrPostWizardProfilSpatial.java:1912-4350 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |