]> git.somenet.org - pub/jan/sbc.git/commit
Merge branch 'master' of
authorGregor Riegler <gregor.riegler@gmail.com>
Sun, 5 May 2013 20:40:15 +0000 (22:40 +0200)
committerGregor Riegler <gregor.riegler@gmail.com>
Sun, 5 May 2013 20:40:15 +0000 (22:40 +0200)
commit4ee91c1ae633c918cf985859873a058805415465
tree0466c3d58b1ca6f5f8ab6bb4849442f4ec121644
parent426099ee58ff639d6bdc6e78aab7cf2d52ab1bb3
parentd948af15bd6c72d262da7f15c8bb3e6db4af0b69
Merge branch 'master' of
https://rgregor@bitbucket.org/rgregor/sbc-ss-2013.git

Conflicts:
src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/PizzeriaAgent.java
src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/gui/DEP_Table.java
src/main/java/at/ac/tuwien/sbc/valesriegler/types/GroupData.java
src/main/java/at/ac/tuwien/sbc/valesriegler/xvsm/XVSMConnector.java
src/main/java/at/ac/tuwien/sbc/valesriegler/group/gui/GroupFrame.java
src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/PizzeriaAgent.java
src/main/java/at/ac/tuwien/sbc/valesriegler/types/GroupData.java
src/main/java/at/ac/tuwien/sbc/valesriegler/xvsm/XVSMConnector.java
src/main/java/at/ac/tuwien/sbc/valesriegler/xvsm/waiter/Waiter.java