comparison src/settings.sml @ 2229:54884b28b6c6

Merge.
author Ziv Scully <ziv@mit.edu>
date Tue, 07 Apr 2015 17:26:53 -0400
parents 25c94de06e3c e8863d9f8c59
children a07b91fa71db
comparison
equal deleted inserted replaced
2228:25c94de06e3c 2229:54884b28b6c6