From 76f73a67929da0ad405a0aea88f0d7ed4cd6d5cf Mon Sep 17 00:00:00 2001
From: Jinkun Jang <jinkun.jang@samsung.com>
Date: Thu, 14 Mar 2013 15:02:01 +0900
Subject: [PATCH] sync

---
 .dir-locals.el |  15 +++++++
 .gitattributes |  32 +++++++++++++++
 .gitignore     | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 .qmake.conf    |   1 +
 4 files changed, 169 insertions(+)
 create mode 100644 .dir-locals.el
 create mode 100644 .gitattributes
 create mode 100644 .gitignore
 create mode 100644 .qmake.conf

diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 0000000..3fe2340
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,15 @@
+;; Per-directory local variables for GNU Emacs 23 and later.
+
+;; Syntax: ((MODE (VAR . VAL) ...) ...)
+;; MODE is a symbol like `c-mode', or `nil' for all modes.
+((c-mode
+  (indent-tabs-mode . nil)
+  (c-basic-offset . 4))
+ (c++-mode
+  (indent-tabs-mode . nil)
+  (c-basic-offset . 4))
+ (java-mode
+  (indent-tabs-mode . nil)
+  (c-basic-offset . 4))
+ (change-log-mode
+  (indent-tabs-mode . nil)))
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..3fd4f88
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,32 @@
+# To enable automatic merging of ChangeLog files, use the following command:
+# git config merge.changelog.driver "resolve-ChangeLogs --merge-driver %O %A %B"
+ChangeLog* merge=changelog
+
+# To enable smart diffing of ObjC[++] files, run the following commands:
+# git config diff.objcpp.xfuncname "^[-+@a-zA-Z_].*$"
+# git config diff.objcppheader.xfuncname "^[@a-zA-Z_].*$"
+*.m diff=objc
+*.mm diff=objcpp
+mac/*.h diff=objcppheader
+*/mac/*.h diff=objcppheader
+*/*/mac/*.h diff=objcppheader
+objc/*.h diff=objcppheader
+*/objc/*.h diff=objcppheader
+*/*/objc/*.h diff=objcppheader
+
+# To enable smart diffing of *.strings files, run the following command:
+# git config diff.localizablestrings.textconv "iconv -f utf-16 -t utf-8"
+*.strings diff=localizablestrings
+
+*.vcproj eol=crlf
+*.vsprops eol=crlf
+*.sln eol=crlf
+
+# For best performance, place rules for deep paths in the parent directory.
+# For example: instead of "Source/WebCore/inspector/Inspector.json -crlf" here,
+# place "Inspector.json -crlf" in Source/WebCore/inspector/.gitattributes
+
+# For package build time/size optimization purposes, do not export Test data.
+/LayoutTests export-ignore
+/ManualTests export-ignore
+/PerformanceTests export-ignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..bcb906a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,121 @@
+*.mode*
+*.pbxuser
+*.perspective*
+*.pyc
+.DS_Store
+.directory
+build/
+/WebKitBuild/
+BuildWK2-arm
+BuildWK2-i386
+autoinstall.cache.d
+project.xcworkspace
+xcuserdata
+backupForBuildScript.patch
+
+# Ignore auto-generated files by VS2005 and VS2010.
+*.vcproj.*.user
+*.suo
+
+# Ignore common tool auto-generated files.
+.gdb_history
+tags
+*~
+*.swp
+
+# For best performance, place rules for deep paths in the parent directory.
+# For example: instead of placing Source/WebKit/chromium/WebKit.xcodeproj here,
+# place WebKit.xcodeproj in Source/WebKit/chromium/.gitignore
+
+# Ignore files that Chromium port generates
+/Makefile.chromium
+/out
+/gyp-mac-tool
+
+# Though the GTK build builds in a subdirectory, autogen.sh still deposits
+# a few files into the source tree.
+/aclocal.m4
+/autom4te.cache
+/Source/autotools/compile
+/Source/autotools/config.guess
+/Source/autotools/config.sub
+/Source/autotools/depcomp
+/Source/autotools/gtk-doc.m4
+/Source/autotools/install-sh
+/Source/autotools/libtool.m4
+/Source/autotools/ltmain.sh
+/Source/autotools/ltoptions.m4
+/Source/autotools/ltsugar.m4
+/Source/autotools/ltversion.m4
+/Source/autotools/lt~obsolete.m4
+/Source/autotools/missing
+/Source/WebKit/gtk/docs/GNUmakefile.in
+/Source/WebKit/gtk/po/*.pot
+/autotoolsconfig.h.in
+/configure
+/GNUmakefile.in
+/gtk-doc.make
+/INSTALL
+/README
+
+# Ignore files installed by WebKitSupportLibrary/WebKitAuxiliaryLibrary
+/WebKitSupportLibrary.zip
+/WebKitLibraries/win/Software License Agreement for WebKit Support Libraries.rtf
+/WebKitLibraries/win/WebKitAuxiliaryLibrary.headers
+/WebKitLibraries/win/WebKitAuxiliaryLibraryVersion
+/WebKitLibraries/win/WebKitChangesToPthreads.diff
+/WebKitLibraries/win/include/ApplicationServices/
+/WebKitLibraries/win/include/AssertMacros.h
+/WebKitLibraries/win/include/Availability.h
+/WebKitLibraries/win/include/AvailabilityInternal.h
+/WebKitLibraries/win/include/AvailabilityMacros.h
+/WebKitLibraries/win/include/CFNetwork/
+/WebKitLibraries/win/include/ColorSync/
+/WebKitLibraries/win/include/ConditionalMacros.h
+/WebKitLibraries/win/include/CoreFoundation/
+/WebKitLibraries/win/include/CoreGraphics/
+/WebKitLibraries/win/include/CoreServices/
+/WebKitLibraries/win/include/ImageIO/
+/WebKitLibraries/win/include/QuartzCore/
+/WebKitLibraries/win/include/SQLite/
+/WebKitLibraries/win/include/SafariTheme/
+/WebKitLibraries/win/include/TargetConditionals.h
+/WebKitLibraries/win/include/checkint.h
+/WebKitLibraries/win/include/dispatch/
+/WebKitLibraries/win/include/inttypes.h
+/WebKitLibraries/win/include/libxml/
+/WebKitLibraries/win/include/libxslt/
+/WebKitLibraries/win/include/pthreads/
+/WebKitLibraries/win/include/stdbool.h
+/WebKitLibraries/win/include/stdint.h
+/WebKitLibraries/win/include/unicode/
+/WebKitLibraries/win/include/unistd.h
+/WebKitLibraries/win/include/xlocale.h
+/WebKitLibraries/win/include/zlib/
+/WebKitLibraries/win/lib/CFNetwork.lib
+/WebKitLibraries/win/lib/CoreFoundation.lib
+/WebKitLibraries/win/lib/CoreGraphics.lib
+/WebKitLibraries/win/lib/QuartzCore.lib
+/WebKitLibraries/win/lib/SQLite3.lib
+/WebKitLibraries/win/lib/SafariTheme.lib
+/WebKitLibraries/win/lib/icuin.lib
+/WebKitLibraries/win/lib/icuuc.lib
+/WebKitLibraries/win/lib/libdispatch.lib
+/WebKitLibraries/win/lib/libicuin.lib
+/WebKitLibraries/win/lib/libicuuc.lib
+/WebKitLibraries/win/lib/libxml2.lib
+/WebKitLibraries/win/lib/libxslt.lib
+/WebKitLibraries/win/lib/pthreadVC2.lib
+/WebKitLibraries/win/lib/zdll.lib
+
+# Ignore files generated by Qt Creator:
+*.pro.user
+
+# Ignore KDevelop files:
+.kdev_include_paths
+*.kdev4
+*.kate-swp
+
+# Ignore Eclipse files:
+.project
+.cproject
diff --git a/.qmake.conf b/.qmake.conf
new file mode 100644
index 0000000..78f46ce
--- /dev/null
+++ b/.qmake.conf
@@ -0,0 +1 @@
+QMAKEPATH += $$PWD/Tools/qmake $$shadowed($$PWD/Tools/qmake)
-- 
2.7.4