| commit | 2adfb82e38079a2964bfb33a711b0597b51ea775 | [log] [tgz] |
|---|---|---|
| author | genia.likes.science@gmail.com <genia.likes.science@gmail.com> | Wed Jun 05 14:37:17 2013 -0700 |
| committer | genia.likes.science@gmail.com <genia.likes.science@gmail.com> | Wed Jun 05 14:37:17 2013 -0700 |
| tree | 536dd3723a5379d009e74bcb5b87b30e7e918721 | |
| parent | 78f2984a6ca17520198e5ec8afb18bef8d0e7c6e [diff] | |
| parent | 212e24297ae1b609919f3de000090e21129b41a4 [diff] |
Merge branch 'master' into eugenia/asterix_sdk_stable Conflicts: asterix-app/src/main/java/edu/uci/ics/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java