[DEECo] [d3scomp/JDEECo] 89563f: Resolving conflicts

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/d3scomp/JDEECo
  Commit: 89563fb2d3079de6902d6c5a15241723d0a0d236
      https://github.com/d3scomp/JDEECo/commit/89563fb2d3079de6902d6c5a15241723d0a0d236
  Author: Michał Kit <kit at d3s.mff.cuni.cz>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/processor/ClassProcessor.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/processor/ParsedObjectReader.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/processor/ParsedObjectWriter.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/provider/AbstractDEECoObjectProvider.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/provider/ClassDEECoObjectProvider.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/provider/ComponentInstance.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/provider/DEECoObjectProvider.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/provider/FileDEECoObjectProvider.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/provider/InitializedDEECoObjectProvider.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/provider/ParsedComponent.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/provider/PreLauncherDEECoObjectProvider.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/IRuntime.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/PreprocessorLauncher.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/Runtime.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/jmx/RuntimeMX.java
    M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloudJPF.java
    M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloudNoJPF.java
    M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherCloudNoJPFDiscreteScheduler.java
    M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/LocalLauncherDynamicCloudNoJPF.java
    M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/NodeC.java
    M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/cloud/TSLauncherCloudNoJPF.java
    M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/convoy/LocalLauncherConvoyJPF.java
    M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/convoy/LocalLauncherConvoyNoJPF.java
    M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/convoy/TSLauncherConvoyNoJPF.java
    M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/convoytut/LocalLauncherLTL.java
    M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/FFLauncher.java
    M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/FFLauncherDiscreteScheduler.java
    M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/FFLauncherDiscreteSchedulerHexacopter.java
    M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/firefighters/FFLauncherHexacopter.java
    M jdeeco-demo/src/cz/cuni/mff/d3s/deeco/demo/parkinglotbooking/TSParkingLotLauncherNoJPF.java
    M jdeeco-jpf/src/cz/cuni/mff/d3s/deeco/ltl/LocalLauncherExampleJPF.java
    M jdeeco-sde/META-INF/MANIFEST.MF

  Log Message:
  -----------
  Resolving conflicts