Merge branch 'master' into carljparker/config-include-20181101

carljparker · carljparker · commit c3617af6e68c · 2018-11-01T15:57:15.000-07:00
diff --git a/cross-platform-scale-2015-demo/.buckconfig b/cross-platform-scale-2015-demo/.buckconfig
@@ -27,6 +27,9 @@
   source_level = 6
   target_level = 6
 
+[parser]
+  default_build_file_syntax = skylark
+
 [project]
     default_android_manifest = //android/AndroidManifest.xml
     ignore = .buckd, \
diff --git a/hello-buck-cxx/.buckconfig b/hello-buck-cxx/.buckconfig
@@ -10,3 +10,6 @@
 #
 <?file:future-platform/future-platform.include>
 
+[parser]
+  default_build_file_syntax = skylark
+
diff --git a/hello-buck-java/.buckconfig b/hello-buck-java/.buckconfig
@@ -1,3 +1,6 @@
+[parser]
+  default_build_file_syntax = skylark
+
 [alias]
   hello_buck_java = //com/facebook/buck/demo:hello-buck-java
 

Original file line number	Diff line number	Diff line change
`@@ -10,3 +10,6 @@`
`10`	`10`	`#`
`11`	`11`	`<?file:future-platform/future-platform.include>`
`12`	`12`
	`13`	`+[parser]`
	`14`	`+ default_build_file_syntax = skylark`
	`15`	`+`