Bug 1382304: hg/gitignore captures/ dir. r=nalexander
authorMichael Comella <michael.l.comella@gmail.com>
Wed, 19 Jul 2017 11:08:06 -0700
changeset 369761 4a7dd87506167cf613c905f0249cceb70c7a6b7c
parent 369760 eb1d92b2b6a4161492561250f51bae5bafeda68a
child 369762 986de13adb0a2b7ba6369deaccdd583915857d91
push id32203
push userarchaeopteryx@coole-files.de
push dateThu, 20 Jul 2017 08:55:28 +0000
treeherdermozilla-central@b31c56eb6317 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1382304
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1382304: hg/gitignore captures/ dir. r=nalexander MozReview-Commit-ID: 9PZoAItKsRI
.gitignore
.hgignore
--- a/.gitignore
+++ b/.gitignore
@@ -57,16 +57,18 @@ parser/html/java/javaparser/
 # Ignore the files and directory that Eclipse IDE creates
 .project
 .cproject
 .settings/
 
 # Ignore the files and directory that JetBrains IDEs create.
 /.idea/
 *.iml
+# Android Monitor in Android Studio creates a captures/ directory.
+/captures/
 
 # Gradle cache.
 /.gradle/
 
 # Local Gradle configuration properties.
 /local.properties
 
 # Python virtualenv artifacts.
--- a/.hgignore
+++ b/.hgignore
@@ -59,16 +59,18 @@
 # Ignore the files and directory that Eclipse IDE creates
 \.project$
 \.cproject$
 \.settings/
 
 # Ignore the files and directory that JetBrains IDEs create.
 \.idea/
 \.iml$
+# Android Monitor in Android Studio creates a captures/ directory.
+^captures/
 
 # Gradle cache.
 ^.gradle/
 
 # Local Gradle configuration properties.
 ^local.properties$
 
 # Python stuff installed at build time.