Started by upstream project "org.subshare" build number 105105org.subsharejob/org.subshare/false4851968737org.subshare.www #812016-06-08_18-08-23false81SUCCESS1465402103000https://www.codewizards.co:443/jenkins/view/org.subshare/job/org.subshare.www/81//trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/dto/CollisionDto.java/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/collision/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/collision/CollisionData.java/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/collision/CollisionPane.fxgraph/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/collision/CollisionPane.fxml/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/collision/CollisionPane.java/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/collision/messages.properties/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/filetree/repoaware/RepoAwareFileTreePane.java/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/maintree/LocalRepoDirectoryMainTreeItem.java/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/Collision.javahttps://www.codewizards.co:443/jenkins/user/mnMarco Nguitragool-Schulze43114653998249682016-06-08T15:30:24.968290Z* Added collision marker icon to main tree. * Refactored collision marker icon handling in file-tree (=> asynchronous, non-blocking!). * Started wizard for resolving collsions.edit/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/dto/CollisionDto.javaadd/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/collisionadd/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/collision/CollisionData.javaadd/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/collision/CollisionPane.fxgraphadd/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/collision/CollisionPane.fxmladd/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/collision/CollisionPane.javaadd/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/collision/messages.propertiesedit/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/filetree/repoaware/RepoAwareFileTreePane.javaedit/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/maintree/LocalRepoDirectoryMainTreeItem.javaedit/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/Collision.java431Marco Nguitragool-Schulzesvnhttps://www.codewizards.co/svn/subshare/trunk/org.subshare431https://www.codewizards.co:443/jenkins/user/mnMarco Nguitragool-Schulze3.0.4