MANUELA Code

Tool for assessment of environmental services on farm scale.

Status: Beta

Brought to you by: wellgis

• Summary
• Reviews
• Support
• Wiki
• Bug Tracker
• SVN ▾
  • Code
  • ManuelaFX

Menu ▾ ▴

 

• Browse Commits
• Browse Files

Commit [r478]  Maximize  Restore  History

After endless try and error to merge the Changes of Branch "dev 1" back into the Trunk ITS DONE.

Authored by: wellgis 2014-02-19

Browse code at this revision

Parent: [r477]

Child: [r479]

1 2 > >> (Page 1 of 2)

copied	/branches/dev 1/src/de/luh/iup/manuela/farm/CropShare.java -> /trunk/src/de/luh/iup/manuela/farm/CropShare.java
changed	/trunk/src
changed	/trunk/src/de/luh/iup/manuela/ManuelaExtension.java
changed	/trunk/src/de/luh/iup/manuela/agroxml/ImportAgroXMLPlugin.java
changed	/trunk/src/de/luh/iup/manuela/base/ManuelaConnect.properties
changed	/trunk/src/de/luh/iup/manuela/base/ManuelaSettings.java
changed	/trunk/src/de/luh/iup/manuela/bdp/BDPPlugIn.java
changed	/trunk/src/de/luh/iup/manuela/biotopetype/ImportBiotopeTypeMapPlugin.java
changed	/trunk/src/de/luh/iup/manuela/biotopetype/InterlinkedBiotopesPlugin.java
changed	/trunk/src/de/luh/iup/manuela/chart/ChartPlugin.java
changed	/trunk/src/de/luh/iup/manuela/economic
changed	/trunk/src/de/luh/iup/manuela/economic/ASCIIFileReaderPlugin.java
changed	/trunk/src/de/luh/iup/manuela/economy/EconomyPlugin.java
changed	/trunk/src/de/luh/iup/manuela/economy/EconomyViewFX.fxml
changed	/trunk/src/de/luh/iup/manuela/economy/EconomyViewFXController.java
changed	/trunk/src/de/luh/iup/manuela/erosion/water/WaterErosionPlugin.java
changed	/trunk/src/de/luh/iup/manuela/farm/AddFarmPlugin.java
removed	/trunk/src/de/luh/iup/manuela/farm/CropPercentage.java
changed	/trunk/src/de/luh/iup/manuela/farm/CropRotationPlugin.java
changed	/trunk/src/de/luh/iup/manuela/farm/CropRotationRating.java
changed	/trunk/src/de/luh/iup/manuela/farm/CropRotationRatingResultDialog.java
changed	/trunk/src/de/luh/iup/manuela/farm/FarmValuationChartPlugin.java
changed	/trunk/src/de/luh/iup/manuela/field/DigitizeFieldCursorTool.java
changed	/trunk/src/de/luh/iup/manuela/field/FieldViewFXController.java
changed	/trunk/src/de/luh/iup/manuela/field/LoadFieldPlugin.java

/branches/dev 1/src/de/luh/iup/manuela/farm/CropShare.java to /trunk/src/de/luh/iup/manuela/farm/CropShare.java

File was copied.

/trunk/src

Directory.

/trunk/src/de/luh/iup/manuela/ManuelaExtension.java Diff Switch to side-by-side view

/trunk/src/de/luh/iup/manuela/agroxml/ImportAgroXMLPlugin.java Diff Switch to side-by-side view

/trunk/src/de/luh/iup/manuela/base/ManuelaConnect.properties Diff Switch to side-by-side view

/trunk/src/de/luh/iup/manuela/base/ManuelaSettings.java Diff Switch to side-by-side view

/trunk/src/de/luh/iup/manuela/bdp/BDPPlugIn.java Diff Switch to side-by-side view

/trunk/src/de/luh/iup/manuela/biotopetype/ImportBiotopeTypeMapPlugin.java Diff Switch to side-by-side view

/trunk/src/de/luh/iup/manuela/biotopetype/InterlinkedBiotopesPlugin.java Diff Switch to side-by-side view

/trunk/src/de/luh/iup/manuela/chart/ChartPlugin.java Diff Switch to side-by-side view

/trunk/src/de/luh/iup/manuela/economic

Directory.

/trunk/src/de/luh/iup/manuela/economic/ASCIIFileReaderPlugin.java Diff Switch to side-by-side view

/trunk/src/de/luh/iup/manuela/economy/EconomyPlugin.java Diff Switch to side-by-side view

/trunk/src/de/luh/iup/manuela/economy/EconomyViewFX.fxml Diff Switch to side-by-side view

/trunk/src/de/luh/iup/manuela/economy/EconomyViewFXController.java Diff Switch to side-by-side view

/trunk/src/de/luh/iup/manuela/erosion/water/WaterErosionPlugin.java Diff Switch to side-by-side view

/trunk/src/de/luh/iup/manuela/farm/AddFarmPlugin.java Diff Switch to side-by-side view

/trunk/src/de/luh/iup/manuela/farm/CropPercentage.java

File was removed.

/trunk/src/de/luh/iup/manuela/farm/CropRotationPlugin.java Diff Switch to side-by-side view

/trunk/src/de/luh/iup/manuela/farm/CropRotationRating.java Diff Switch to side-by-side view

/trunk/src/de/luh/iup/manuela/farm/CropRotationRatingResultDialog.java Diff Switch to side-by-side view

/trunk/src/de/luh/iup/manuela/farm/FarmValuationChartPlugin.java Diff Switch to side-by-side view

/trunk/src/de/luh/iup/manuela/field/DigitizeFieldCursorTool.java Diff Switch to side-by-side view

/trunk/src/de/luh/iup/manuela/field/FieldViewFXController.java Diff Switch to side-by-side view

/trunk/src/de/luh/iup/manuela/field/LoadFieldPlugin.java Diff Switch to side-by-side view

1 2 > >> (Page 1 of 2)

✕