[DEECo] [d3scomp/JDEECo] 5a1296: init new branch

[GitHub]

  Branch: refs/heads/newgen
  Home:   https://github.com/d3scomp/JDEECo
  Commit: 5a12962afc43e76fdff7f556c86d31a917daf50c
      https://github.com/d3scomp/JDEECo/commit/5a12962afc43e76fdff7f556c86d31a917daf50c
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M jdeeco-core/pom.xml
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/test/playground/MyRemoteEventListener.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/test/playground/NotifyTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/test/playground/Test.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/test/playground/TupleSpaceStateTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/test/unit/TestNGExamples.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/test/unit/knowledge/KPBuilderTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/test/unit/knowledge/LocalKnowledgeRepositoryTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/test/unit/knowledge/RepositoryKnowledgeManagerTest.java
    M jdeeco-parent/pom.xml

  Log Message:
  -----------
  init new branch


  Commit: 5f20ce9397e1972d32058157788713bbd2fc0739
      https://github.com/d3scomp/JDEECo/commit/5f20ce9397e1972d32058157788713bbd2fc0739
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    R jdeeco-core/OSGI-INF/JDEECoOSGILocalKnowledgeRepository.xml
    R jdeeco-core/OSGI-INF/JDEECoOSGIMultithreadedScheduler.xml
    R jdeeco-core/OSGI-INF/JDEECoOSGIRepositoryKnowledgeManager.xml
    R jdeeco-core/OSGI-INF/JDEECoOSGIRuntime.xml
    R jdeeco-core/config/logging.properties
    M jdeeco-core/pom.xml
    R jdeeco-core/top.xml
    M jdeeco-parent/pom.xml

  Log Message:
  -----------
  Merge branch 'newgen' of git at github.com:d3scomp/JDEECo.git into newgen

Conflicts:
	jdeeco-parent/pom.xml


Compare: https://github.com/d3scomp/JDEECo/compare/9995feb97e5c...5f20ce9397e1