[DEECo] [d3scomp/JDEECo] 7053b6: L1 update

[GitHub]

  Branch: refs/heads/network
  Home:   https://github.com/d3scomp/JDEECo
  Commit: 7053b6192d93439057a6b30e7b438540664843c9
      https://github.com/d3scomp/JDEECo/commit/7053b6192d93439057a6b30e7b438540664843c9
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Device.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/L1Packet.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2Packet.java

  Log Message:
  -----------
  L1 update


  Commit: 725479b3078c75fa6d94741542df20c20e6bb2d2
      https://github.com/d3scomp/JDEECo/commit/725479b3078c75fa6d94741542df20c20e6bb2d2
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M jdeeco-architecture/.gitignore
    M jdeeco-architecture/.project
    M jdeeco-architecture/2014/OMNetIntegration-Scheduler.dnx
    M jdeeco-architecture/2014/OMNetIntegration-Synchronizer.dnx
    M jdeeco-architecture/2014/architecture-2013-10-24.emx
    M jdeeco-architecture/2014/architecture-2013-10-25.emx
    M jdeeco-architecture/2014/architecture-2013-10-26.emx
    M jdeeco-architecture/2014/architecture-2013-10-30.emx
    M jdeeco-architecture/2014/architecture-2013-11-04.emx
    M jdeeco-architecture/2014/architecture-2013-11-18.emx
    M jdeeco-architecture/2014/architecture-2013-12-11.emx
    M jdeeco-architecture/2014/jDEECo-OMNet-MATSim.dnx
    M jdeeco-architecture/2014/jDEECo-OMNet.dnx
    M jdeeco-architecture/2014/reverse-jdeeco-core.tc
    M jdeeco-architecture/2015/architecture-2015-02-04.emx
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/PacketType.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/exceptions/MarshallingException.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/exceptions/UnregistredPacketType.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer1.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2Packet.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer2.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/PacketHeader.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/ReceivedInfo.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Strategy.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/marshaller/Marshaller.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/marshaller/MarshallerRegistry.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/marshaller/SerializingMarshaller.java
    R jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/AppTest.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/L2Test.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/MarshallingTest.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/PacketTypeTest.java

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

Conflicts:
	jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2Packet.java


  Commit: df26089eb29135f7bfe168720b133f6d967a7c50
      https://github.com/d3scomp/JDEECo/commit/df26089eb29135f7bfe168720b133f6d967a7c50
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DataIDSource.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DefaultDataIDSource.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/L1Packet.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/L1ReceivedInfo.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer1.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/MANETReceivedInfo.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/ReceivedInfo.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2Packet.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2ReceivedInfo.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer2.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/ReceivedInfo.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/L2Test.java
    A jdeeco-parent/jDEECoFormatter.xml

  Log Message:
  -----------
  update


Compare: https://github.com/d3scomp/JDEECo/compare/af79ae992dc5...df26089eb291