]> git.somenet.org - pub/jan/sbc.git/commit
Merge branch 'master' of
authorGregor Riegler <gregor.riegler@gmail.com>
Mon, 6 May 2013 00:08:07 +0000 (02:08 +0200)
committerGregor Riegler <gregor.riegler@gmail.com>
Mon, 6 May 2013 00:08:07 +0000 (02:08 +0200)
commit99000f3fd3c23eb87478231475b4137e6e3b6c6b
treece2c4c81142998754ed111c3c19088dec627d960
parentbdfce63e733b5fee4a22c7349e2a526c76a72dcf
parent26df8693db78522d877eef1621ff59311b8834ac
Merge branch 'master' of
https://rgregor@bitbucket.org/rgregor/sbc-ss-2013.git

Conflicts:
src/main/java/at/ac/tuwien/sbc/valesriegler/group/Group.java
src/main/java/at/ac/tuwien/sbc/valesriegler/types/GroupData.java
src/main/java/at/ac/tuwien/sbc/valesriegler/group/Group.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