[DEECo] [d3scomp/JDEECo] c26234: Merge pull request #142 from d3scomp/newgen-iliasg

[GitHub]

  Branch: refs/heads/newgen-iliasg
  Home:   https://github.com/d3scomp/JDEECo
  Commit: c26234bc465d51f60367aacd15ee4373cace7991
      https://github.com/d3scomp/JDEECo/commit/c26234bc465d51f60367aacd15ee4373cace7991
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java

  Log Message:
  -----------
  Merge pull request #142 from d3scomp/newgen-iliasg

merging quick fix to master


  Commit: 82f849ddc5ebcb9a94a3a4a251c5d26c32d08c44
      https://github.com/d3scomp/JDEECo/commit/82f849ddc5ebcb9a94a3a4a251c5d26c32d08c44
  Author: Ilias Gerostathopoulos <iliasg at d3s.mff.cuni.cz>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into newgen-iliasg


Compare: https://github.com/d3scomp/JDEECo/compare/ff7d75ff65fa...82f849ddc5eb