diff options
Diffstat (limited to 'src/rustllvm/llvm-rebuild-trigger')
| -rw-r--r-- | src/rustllvm/llvm-rebuild-trigger | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/rustllvm/llvm-rebuild-trigger b/src/rustllvm/llvm-rebuild-trigger index b2d4c113295..6b410502e49 100644 --- a/src/rustllvm/llvm-rebuild-trigger +++ b/src/rustllvm/llvm-rebuild-trigger @@ -1,8 +1,4 @@ # If this file is modified, then llvm will be (optionally) cleaned and then rebuilt. # The actual contents of this file do not matter, but to trigger a change on the # build bots then the contents should be changed so git updates the mtime. -<<<<<<< 37849a002ed91ac2b80aeb2172364b4e19250e05 -2017-06-27 -======= -2017-06-26 ->>>>>>> rustc: Implement the #[global_allocator] attribute +2017-07-12 |