Skip to content

Commit 782fe0d

Browse files
author
Vladislav Yaroslavlev
committed
Merge remote-tracking branch 'refs/remotes/github/master'
2 parents c57220f + 31c8ed9 commit 782fe0d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+729
-127
lines changed

‎Android.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,9 @@ proguard/
2424

2525
# Log Files
2626
*.log
27+
28+
# Android Studio Navigation editor temp files
29+
.navigation/
30+
31+
# Android Studio captures folder
32+
captures/

‎AppEngine.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Google App Engine generated folder
2+
appengine-generated/

‎ArchLinuxPackages.gitignore‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
*.tar
22
*.tar.*
3+
*.jar
4+
*.exe
5+
*.msi
36
*.zip
47
*.tgz
58
*.log
69
*.log.*
710
*.sig
811

9-
# AUR metadata
10-
.AURINFO
11-
.SRCINFO
12-
1312
pkg/
1413
src/

‎Autotools.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,13 @@ Makefile.in
55
# http://www.gnu.org/software/autoconf
66

77
/autom4te.cache
8+
/autoscan.log
9+
/autoscan-*.log
810
/aclocal.m4
911
/compile
12+
/config.h.in
1013
/configure
14+
/configure.scan
1115
/depcomp
1216
/install-sh
1317
/missing

‎C.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,6 @@
2727
*.i*86
2828
*.x86_64
2929
*.hex
30+
31+
# Debug files
32+
*.dSYM/

‎CMake.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
CMakeCache.txt
22
CMakeFiles
3+
CMakeScripts
34
Makefile
45
cmake_install.cmake
56
install_manifest.txt

‎CUDA.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
*.i
2+
*.ii
3+
*.gpu
4+
*.ptx
5+
*.cubin
6+
*.fatbin

‎CakePHP.gitignore‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
tmp/*
2-
[Cc]onfig/core.php
3-
[Cc]onfig/database.php
4-
app/tmp/*
5-
app/[Cc]onfig/core.php
6-
app/[Cc]onfig/database.php
7-
!empty
1+
# CakePHP 3
2+
3+
/vendor/*
4+
/config/app.php
5+
/tmp/*
6+
/logs/*
7+
8+
# CakePHP 2
9+
10+
/app/tmp/*
11+
/app/Config/core.php
12+
/app/Config/database.php
13+
/vendors/*

‎CodeIgniter.gitignore‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
*/config/development
22
*/logs/log-*.php
3-
*/logs/!index.html
3+
!*/logs/index.html
44
*/cache/*
5-
*/cache/!index.html
6-
*/cache/!.htaccess
5+
!*/cache/index.html
6+
!*/cache/.htaccess

‎Composer.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
composer.phar
2-
vendor/
2+
/vendor/
33

44
# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
55
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file

0 commit comments

Comments
 (0)