# HG changeset patch
# User Kaito Tokumori <e105711@ie.u-ryukyu.ac.jp>
# Date 1387285185 -32400
# Node ID f083f14114338332f6a2b7cf260524a820ed55ea
# Parent  e9d31d41d9f70febf14a21a96d106327170ba7be# Parent  07190e83f4d3e3412f12e9f68a3c5c63ebb7e438
merge

diff -r e9d31d41d9f7 -r f083f1411433 .arcconfig
--- a/.arcconfig	Tue Dec 17 20:18:44 2013 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-{
-  "project_id" : "llvm",
-  "conduit_uri" : "http://llvm-reviews.chandlerc.com/"
-}
diff -r e9d31d41d9f7 -r f083f1411433 .clang-format
--- a/.clang-format	Tue Dec 17 20:18:44 2013 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-BasedOnStyle: LLVM
diff -r e9d31d41d9f7 -r f083f1411433 .gitignore
--- a/.gitignore	Tue Dec 17 20:18:44 2013 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-#==============================================================================#
-# This file specifies intentionally untracked files that git should ignore.
-# See: http://www.kernel.org/pub/software/scm/git/docs/gitignore.html
-#
-# This file is intentionally different from the output of `git svn show-ignore`,
-# as most of those are useless.
-#==============================================================================#
-
-#==============================================================================#
-# File extensions to be ignored anywhere in the tree.
-#==============================================================================#
-# Temp files created by most text editors.
-*~
-# Merge files created by git.
-*.orig
-# Byte compiled python modules.
-*.pyc
-# vim swap files
-.*.swp
-.sw?
-
-#==============================================================================#
-# Explicit files to ignore (only matches one).
-#==============================================================================#
-.gitusers
-autom4te.cache
-cscope.files
-cscope.out
-autoconf/aclocal.m4
-autoconf/autom4te.cache
-compile_commands.json
-
-#==============================================================================#
-# Directories to ignore (do not add trailing '/'s, they skip symlinks).
-#==============================================================================#
-# External projects that are tracked independently.
-projects/*
-!projects/sample
-!projects/CMakeLists.txt
-!projects/Makefile
-# Clang, which is tracked independently.
-tools/clang
-# LLDB, which is tracked independently.
-tools/lldb
-# lld, which is tracked independently.
-tools/lld
-# Sphinx build tree, if building in-source dir.
-docs/_build