Hai Brenner 6b512e078b Merge branch 'master' into dist_dec ... # Conflicts: # meerkat-common/src/main/java/meerkat/crypto/concrete/ECElGamalEncryption.java # meerkat-common/src/main/proto/meerkat/BulletinBoardAPI.proto # settings.gradle		2016-08-09 14:30:40 +03:00
bulletin-board-client	Fixed some errors in the tests.	2016-06-28 15:08:36 +03:00
bulletin-board-server	Merge branch 'master' of https://cs.idc.ac.il/rhodecode/meerkat/meerkat-java	2016-07-06 21:45:35 +03:00
distributed-key-generation	Make code of SDKG test prettier	2016-08-07 17:04:23 +03:00
gradle/wrapper	Merged move to public qilin version	2016-04-05 11:49:34 +03:00
meerkat-common	Merge branch 'master' into dist_dec	2016-08-09 14:30:40 +03:00
mixer	Merge branch 'master' into dist_dec	2016-08-09 14:30:40 +03:00
polling-station	Merge branch 'master' into vbdev2	2016-07-06 21:55:34 +03:00
restful-api-common	Fix: reading protobuf BoolValues through network used to fail due to problematic dynamic casting	2016-08-02 14:13:10 +03:00
voting-booth	Fix: better test of the NetworkVirtualPrinter	2016-08-02 14:24:25 +03:00
.gitignore	Ignore .arcconfig	2016-06-28 15:10:38 +03:00
build.gradle	Added BB client intergration test (broken)	2015-12-06 20:33:45 +02:00
build.gradle-template	Add configuration for test dependencies between subprojects	2015-11-22 15:31:51 +02:00
gradlew	re-adding required gradle files	2015-12-16 18:15:53 +02:00
gradlew.bat	Added gradle	2015-10-26 16:06:45 +02:00
settings.gradle	Merge branch 'master' into dist_dec	2016-08-09 14:30:40 +03:00
settings.gradle.orig	Merged move to public qilin version	2016-04-05 11:49:34 +03:00