Merge branch 'master' into simd-cleanup

diff --cc basis/alien/c-types/c-types.factor
index 0ee2373b4133f920b9a76f72e414eacf45f4932e,1245aedc324f734b12eed52220e2058d57e3f81a..3ed0a78f14916764f27f5ebe6cb258ac613a3e06
mode 100755,100644..100644
--- 1/basis/alien/c-types/c-types.factor
--- 2/basis/alien/c-types/c-types.factor
+++ b/basis/alien/c-types/c-types.factor

diff --cc basis/classes/struct/struct.factor
index 09de4ac8bc5954ebf9466b22f3a81a060d6417bf,91ad7074662503af5f17e77e892932e2d9707acc..cdd47cae9a1f8b85e98dbf9986369805444ddccc
mode 100755,100644..100644
--- 1/basis/classes/struct/struct.factor
--- 2/basis/classes/struct/struct.factor
+++ b/basis/classes/struct/struct.factor

diff --cc basis/compiler/cfg/builder/builder.factor
index f1b3447fc7339e66f7d2f039b82949dd77e12dd4,cf6215c5cde14b77708e56f963d58cf7552d5460..f1b3447fc7339e66f7d2f039b82949dd77e12dd4
mode 100755,100644..100644
--- 1/basis/compiler/cfg/builder/builder.factor
--- 2/basis/compiler/cfg/builder/builder.factor
+++ b/basis/compiler/cfg/builder/builder.factor

diff --cc basis/compiler/cfg/value-numbering/rewrite/rewrite.factor
index 0fa0314c3ee6eb7563cacdfbd36fae7e78792b26,4864a8bfb7c28f57379ac9931a8dc757b9a3f34e..0fa0314c3ee6eb7563cacdfbd36fae7e78792b26
mode 100755,100644..100644
--- 1/basis/compiler/cfg/value-numbering/rewrite/rewrite.factor
--- 2/basis/compiler/cfg/value-numbering/rewrite/rewrite.factor
+++ b/basis/compiler/cfg/value-numbering/rewrite/rewrite.factor

diff --cc basis/cpu/x86/x86.factor
Simple merge

diff --cc basis/specialized-arrays/specialized-arrays.factor
index b6f7209cc6324e4ae2c4ee2b35ca936c623ccb6c,711354d8034970a2120dd6780b8b6bccafa7b29b..b6f7209cc6324e4ae2c4ee2b35ca936c623ccb6c
mode 100755,100644..100644
--- 1/basis/specialized-arrays/specialized-arrays.factor
--- 2/basis/specialized-arrays/specialized-arrays.factor
+++ b/basis/specialized-arrays/specialized-arrays.factor

diff --cc core/sequences/sequences.factor
index 16949f5542da48d43daba98dfbaff786e7a655c2,5017e52ce577fa6c49297b9545c9cc94b3f9ea34..16949f5542da48d43daba98dfbaff786e7a655c2
mode 100755,100644..100644
--- 1/core/sequences/sequences.factor
--- 2/core/sequences/sequences.factor
+++ b/core/sequences/sequences.factor

diff --cc extra/gpu/demos/bunny/bunny.factor
index ea91e226a85557fe9fc1dc9b58ca0b7e3f9682a2,7b778f05002ec8dcf7bfc20b13a0cd342fccd427..d5ecb16458331ff8b43dca7bd2e9d2562e9213c8
mode 100755,100644..100644
--- 1/extra/gpu/demos/bunny/bunny.factor
--- 2/extra/gpu/demos/bunny/bunny.factor
+++ b/extra/gpu/demos/bunny/bunny.factor

diff --cc extra/terrain/terrain.factor
Simple merge