[DEECo] [d3scomp/JDEECo] 2dd231: Merge remote-tracking branch 'origin/newgen-keznik...

[GitHub]

  Branch: refs/heads/newgen-keznikl
  Home:   https://github.com/d3scomp/JDEECo
  Commit: 2dd2316b602fd4b4e083e33653a8bb3f4b166114
      https://github.com/d3scomp/JDEECo/commit/2dd2316b602fd4b4e083e33653a8bb3f4b166114
  Author: Michał Kit <kit at d3s.mff.cuni.cz>
  Date:   2014-02-19 (Wed, 19 Feb 2014)

  Changed paths:
    M jdeeco-simulation-demo/component.cfg
    M jdeeco-simulation-demo/evaluate.py
    M jdeeco-simulation-demo/model/manet/MANET.ned

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/newgen-keznikl' into newgen-kit


  Commit: 5c16a226d18be291d3cf12de5eb907dd361a981c
      https://github.com/d3scomp/JDEECo/commit/5c16a226d18be291d3cf12de5eb907dd361a981c
  Author: Michał Kit <kit at d3s.mff.cuni.cz>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

  Changed paths:
    M jdeeco-simulation-demo/evaluate.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/newgen-keznikl' into newgen-kit


  Commit: b73253130b5576705f0a9f0c412c99f987491250
      https://github.com/d3scomp/JDEECo/commit/b73253130b5576705f0a9f0c412c99f987491250
  Author: Michał Kit <kit at d3s.mff.cuni.cz>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

  Changed paths:
    M jdeeco-simulation-demo/evaluate.py
    A jdeeco-simulation-demo/model/manet/CustomEthernetInterface.ned
    M jdeeco-simulation-demo/model/manet/Switch.ned
    M jdeeco-simulation-demo/omnetpp.ini.templ

  Log Message:
  -----------
  After merging


  Commit: 901d8da154da1c9132cadd2428bfe17193db8f0e
      https://github.com/d3scomp/JDEECo/commit/901d8da154da1c9132cadd2428bfe17193db8f0e
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2014-03-31 (Mon, 31 Mar 2014)

  Changed paths:
    M jdeeco-simulation-demo/evaluate.py
    M jdeeco-simulation-demo/omnetpp.ini.templ

  Log Message:
  -----------
  latest eval script from bravo


  Commit: 9a77955b821e39d42aaf31145f3ce01b337484c1
      https://github.com/d3scomp/JDEECo/commit/9a77955b821e39d42aaf31145f3ce01b337484c1
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2014-03-31 (Mon, 31 Mar 2014)

  Changed paths:
    M jdeeco-simulation-demo/evaluate.py
    A jdeeco-simulation-demo/model/manet/CustomEthernetInterface.ned
    M jdeeco-simulation-demo/model/manet/Switch.ned

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/newgen-kit' into newgen-keznikl

Conflicts:
	jdeeco-simulation-demo/evaluate.py


Compare: https://github.com/d3scomp/JDEECo/compare/d884a6d1b485...9a77955b821e