]> git.somenet.org - pub/jan/sbc.git/commit
Merge branch 'master' of https://bitbucket.org/rgregor/sbc-ss-2013
authorGregor Riegler <gregor.riegler@gmail.com>
Mon, 10 Jun 2013 15:23:56 +0000 (17:23 +0200)
committerGregor Riegler <gregor.riegler@gmail.com>
Mon, 10 Jun 2013 15:23:56 +0000 (17:23 +0200)
commitf123654e1d0eb313fe45af118a1af33a0507e42f
tree0a258f5f2abd1b5f0f1ac460c1bcb304b26e2893
parent65001a7bbf6ad676834f86298a1e0cfede43bbef
parente26430af9c2a1e0e891dfaa635656d124907c945
Merge branch 'master' of https://bitbucket.org/rgregor/sbc-ss-2013

Conflicts:
src/main/java/at/ac/tuwien/sbc/valesriegler/group/gui/DeliveryOverviewModel.java
src/main/java/at/ac/tuwien/sbc/valesriegler/group/GroupAgent.java