| commit | a3da3e9cba4188d9ab26efa482ae6bee9be4486c | [log] [tgz] |
|---|---|---|
| author | salsubaiee <salsubaiee@gmail.com> | Thu Jul 17 17:19:39 2014 -0700 |
| committer | Ian Maxon <imaxon@uci.edu> | Thu Jul 17 17:33:43 2014 -0800 |
| tree | 0b2f8af14820845156415f1ca44e515d08787d03 | |
| parent | bf664f45285d9bb18bee6a701901ebca9d03c915 [diff] |
Changes to allow having the no-merge policy as an option in asterix. Change-Id: I573b6a09185d51df1ec115edc38a89bd029574d5 Reviewed-on: http://fulliautomatix.ics.uci.edu:8443/107 Reviewed-by: abdullah alamoudi <bamousaa@gmail.com> Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>