Skip to content

Commit c914c25

Browse files
mike-duigoumike-duigou
committed
Merge remote-tracking branch 'github/master'
2 parents 4a9d41f + ee80a54 commit c914c25

Some content is hidden

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

54 files changed

+420
-105
lines changed

‎Android.gitignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ gen/
1515
# Gradle files
1616
.gradle/
1717
build/
18-
/*/build/
1918

2019
# Local configuration file (sdk path, etc)
2120
local.properties
@@ -25,3 +24,9 @@ proguard/
2524

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

‎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/

‎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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
CakePHP 3
1+
# CakePHP 3
22

33
/vendor/*
44
/config/app.php
55
/tmp/*
66
/logs/*
77

8-
CakePHP 2
8+
# CakePHP 2
99

1010
/app/tmp/*
1111
/app/Config/core.php

‎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

‎D.gitignore‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Compiled Object files
2+
*.o
3+
*.obj
4+
5+
# Compiled Dynamic libraries
6+
*.so
7+
*.dylib
8+
*.dll
9+
10+
# Compiled Static libraries
11+
*.a
12+
*.lib
13+
14+
# Executables
15+
*.exe
16+
17+
# DUB
18+
.dub
19+
docs.json
20+
__dummy.html

‎Dart.gitignore‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,27 @@
1-
# Don’t commit the following directories created by pub.
1+
# See https://www.dartlang.org/tools/private-files.html
2+
3+
# Files and directories created by pub
24
.buildlog
5+
.packages
6+
.project
37
.pub/
48
build/
5-
packages
9+
**/packages/
610

7-
# Or the files created by dart2js.
11+
# Files created by dart2js
12+
# (Most Dart developers will use pub build to compile Dart, use/modify these
13+
# rules if you intend to use dart2js directly
14+
# Convention is to use extension '.dart.js' for Dart compiled to Javascript to
15+
# differentiate from explicit Javascript files)
816
*.dart.js
9-
*.js_
17+
*.part.js
1018
*.js.deps
1119
*.js.map
20+
*.info.json
21+
22+
# Directory created by dartdoc
23+
doc/api/
1224

13-
# Include when developing application packages.
25+
# Don't commit pubspec lock file
26+
# (Library packages only! Remove pattern if developing an application package)
1427
pubspec.lock

‎Delphi.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@
5353
__history/
5454
*.~*
5555

56-
# Castalia statistics file
56+
# Castalia statistics file (since XE7 Castalia is distributed with Delphi)
5757
*.stat

0 commit comments

Comments
 (0)