]> git.somenet.org - pub/jan/lsdc.git/commit
Merge branch 'master' of ssh://dev.somenet.org:666/tu/lsdc
authorAndreas Egger <egger.andreas.1@gmail.com>
Tue, 21 May 2013 17:49:28 +0000 (19:49 +0200)
committerAndreas Egger <egger.andreas.1@gmail.com>
Tue, 21 May 2013 17:49:28 +0000 (19:49 +0200)
commit13d3c08dc144e279631da612c887beb1006837c5
tree1c00188297db9ef8b57c8f2c48d6c8dc23ec6fe7
parent47c7c50288ca3447c0d50e39ccffc0a97e2c179f
parentef46cd056fd4ca6c43121818855c5377b9dc35a2
Merge branch 'master' of ssh://dev.somenet.org:666/tu/lsdc

Conflicts:
src/at/ac/tuwien/lsdc/SchedSimulator.java
src/at/ac/tuwien/lsdc/management/MachineManager.java
src/at/ac/tuwien/lsdc/sched/AbstractScheduler.java
src/at/ac/tuwien/lsdc/sched/SchedulerA.java
src/at/ac/tuwien/lsdc/sched/SchedulerB.java
src/at/ac/tuwien/lsdc/sched/SchedulerC.java
src/at/ac/tuwien/lsdc/SchedSimulator.java
src/at/ac/tuwien/lsdc/management/MachineManager.java
src/at/ac/tuwien/lsdc/sched/AbstractScheduler.java
src/at/ac/tuwien/lsdc/sched/SchedulerA.java
src/at/ac/tuwien/lsdc/types/PhysicalMachine.java