Merge remote-tracking branch 'origin/master' into topic/bernhard/topk

This commit is contained in:
Bernhard Amann 2013-05-03 23:04:22 -07:00
commit 6acbbe0231
23 changed files with 146 additions and 47 deletions

View file

@ -1,4 +1,4 @@
@load base/frameworks/sumstats
@load base/frameworks/sumstats/main
module SumStats;

View file

@ -1,4 +1,4 @@
@load base/frameworks/sumstats
@load base/frameworks/sumstats/main
module SumStats;

View file

@ -1,4 +1,4 @@
@load base/frameworks/sumstats
@load base/frameworks/sumstats/main
module SumStats;

View file

@ -1,4 +1,4 @@
@load base/frameworks/sumstats
@load base/frameworks/sumstats/main
@load base/utils/queue
module SumStats;

View file

@ -1,5 +1,5 @@
@load base/frameworks/sumstats/main
@load ./variance
@load base/frameworks/sumstats
module SumStats;

View file

@ -1,4 +1,4 @@
@load base/frameworks/sumstats
@load base/frameworks/sumstats/main
module SumStats;

View file

@ -1,4 +1,4 @@
@load base/frameworks/sumstats
@load base/frameworks/sumstats/main
module SumStats;

View file

@ -1,5 +1,5 @@
@load base/frameworks/sumstats/main
@load ./average
@load base/frameworks/sumstats
module SumStats;