| commit | 90da4199c579630a352dcf1ff7ea40b362fbaaae | [log] [tgz] |
|---|---|---|
| author | genia.likes.science@gmail.com <genia.likes.science@gmail.com> | Fri May 31 10:51:22 2013 -0700 |
| committer | genia.likes.science@gmail.com <genia.likes.science@gmail.com> | Fri May 31 10:51:22 2013 -0700 |
| tree | c9709bdb147f0a0b090e9411400acf09c55b7256 | |
| parent | 64ca88e7f1b9d5c5ab372db5e8c6211502bd5983 [diff] | |
| parent | f006081d6d1db5afd863e6c155791f53671366d5 [diff] |
Merge branch 'master' into eugenia/asterix_sdk_stable Conflicts: asterix-app/src/main/java/edu/uci/ics/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java