Skip to content

Commit ba898eb

Browse files
yatskevichyatskevich
committed
merge upstream/master
2 parents 85a512a + 727777a commit ba898eb

Some content is hidden

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

76 files changed

+476
-217
lines changed

‎Actionscript.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ bin-release/
88

99
# Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
1010
# should NOT be excluded as they contain compiler settings and other important
11-
# information for Eclipse / Flash Builder.
11+
# information for Eclipse / Flash Builder.

‎Android.gitignore‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,12 @@
1212
bin/
1313
gen/
1414

15+
# Ignore gradle files
16+
.gradle/
17+
build/
18+
1519
# Local configuration file (sdk path, etc)
1620
local.properties
1721

18-
# Eclipse project files
19-
.classpath
20-
.project
21-
2222
# Proguard folder generated by Eclipse
2323
proguard/
24-
25-
# Intellij project files
26-
*.iml
27-
*.ipr
28-
*.iws
29-
.idea/
30-

‎C++.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,20 @@
22
*.slo
33
*.lo
44
*.o
5+
*.obj
56

67
# Compiled Dynamic libraries
78
*.so
89
*.dylib
10+
*.dll
911

1012
# Compiled Static libraries
1113
*.lai
1214
*.la
1315
*.a
16+
*.lib
17+
18+
# Executables
19+
*.exe
20+
*.out
21+
*.app

‎C.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Object files
22
*.o
33
*.ko
4+
*.obj
5+
*.elf
46

57
# Libraries
68
*.lib
@@ -16,3 +18,4 @@
1618
*.exe
1719
*.out
1820
*.app
21+
*.hex

‎CONTRIBUTING.md‎

Lines changed: 33 additions & 2 deletions

‎CakePHP.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ tmp/*
44
app/tmp/*
55
app/[Cc]onfig/core.php
66
app/[Cc]onfig/database.php
7-
!empty
7+
!empty

‎CodeIgniter.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
*/logs/!index.html
44
*/cache/*
55
*/cache/!index.html
6+
*/cache/!.htaccess

‎Composer.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
composer.phar
2+
vendor/
3+
4+
# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
5+
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
6+
# composer.lock

‎Concrete5.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
config/site.php
22
files/cache/*
3-
files/tmp/*
3+
files/tmp/*

‎Coq.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
*.vo
22
*.glob
33
*.v.d
4-

0 commit comments

Comments
 (0)