6 Commits

Author SHA1 Message Date
Geoffrey Challen
a662851491 Initial fix of upstream merge. 2017-02-09 10:09:30 -05:00
Geoffrey Challen
8435ba6436 New debug options. 2017-02-09 09:48:06 -05:00
Geoffrey Challen
e318e3171e Revert "Merging in 1.0.2."
This reverts commit 50cf3276e747c545b4ae53853d9b911731dc463e.
2017-01-09 22:52:13 -05:00
Geoffrey Challen
50cf3276e7 Merging in 2.0.2. 2017-01-09 22:40:23 -05:00
Geoffrey Challen
2e721daedf Small change to configuration file. 2015-12-31 14:31:22 -05:00
Geoffrey Challen
cafa9f5690 Initial Spring 2016 commit. 2015-12-23 00:50:04 +00:00