diff options
| author | Peter Sewell | 2017-02-05 11:27:49 +0000 |
|---|---|---|
| committer | Peter Sewell | 2017-02-05 11:27:49 +0000 |
| commit | bd384860e2778fe40e10aaf08cdea7d42dae6287 (patch) | |
| tree | f1c88810d0acd8d6360a8b74d21aed689845884c /etc | |
| parent | 081d3ac6a786fdc3df515de58af2ef25a25a5b58 (diff) | |
| parent | 0f688281254997cb4ca3a6e82275c3751c43fe2c (diff) | |
Merge branch 'master' of bitbucket.org:Peter_Sewell/sail
Conflicts:
language/manual.pdf
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/arm_header | 4 | ||||
| -rw-r--r-- | etc/headache_config | 5 | ||||
| -rw-r--r-- | etc/mips_header | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/etc/arm_header b/etc/arm_header index 566020aa..28639935 100644 --- a/etc/arm_header +++ b/etc/arm_header @@ -1,6 +1,6 @@ -Copyright (c) 2015-2016 Shaked Flur -Copyright (c) 2015-2016 Kathyrn Gray +Copyright (c) 2015-2017 Shaked Flur +Copyright (c) 2015-2017 Kathyrn Gray All rights reserved. This software was developed by the University of Cambridge Computer diff --git a/etc/headache_config b/etc/headache_config index a9d518f1..e8745fee 100644 --- a/etc/headache_config +++ b/etc/headache_config @@ -1,2 +1,3 @@ - ".*\\.lem" -> frame open:"(*" line:"=" close:"*)" -| ".*\\.sail" -> frame open:"(*" line:"=" close:"*)" + ".*\\.mllib" -> frame open:"(*" line:"=" close:"*)" +| ".*\\.lem" -> frame open:"(*" line:"=" close:"*)" +| ".*\\.sail" -> frame open:"(*" line:"=" close:"*)" diff --git a/etc/mips_header b/etc/mips_header index baf682e8..4a99ad2e 100644 --- a/etc/mips_header +++ b/etc/mips_header @@ -1,6 +1,6 @@ -Copyright (c) 2015-2016 Robert M. Norton -Copyright (c) 2015-2016 Kathyrn Gray +Copyright (c) 2015-2017 Robert M. Norton +Copyright (c) 2015-2017 Kathyrn Gray All rights reserved. This software was developed by the University of Cambridge Computer |