Skip to content

Commit 3523237

Browse files
jcowgilljcowgill
committed
Merge remote-tracking branch 'upstream/master'
Conflicts: CSharp.gitignore VB.Net.gitignore
2 parents 799ee6b + 8e05c73 commit 3523237

Some content is hidden

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

69 files changed

+453
-313
lines changed

‎Actionscript.gitignore‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ bin/
33
bin-debug/
44
bin-release/
55

6-
# Project property files
7-
.actionScriptProperties
8-
.flexProperties
6+
# Other files and folders
97
.settings/
10-
.project
8+
9+
# Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
10+
# should NOT be excluded as they contain compiler settings and other important
11+
# information for Eclipse / Flash Builder.

‎Android.gitignore‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,12 @@ local.properties
1818
# Eclipse project files
1919
.classpath
2020
.project
21+
22+
# Proguard folder generated by Eclipse
23+
proguard/
24+
25+
# Intellij project files
26+
*.iml
27+
*.ipr
28+
*.iws
29+
.idea/

‎AppceleratorTitanium.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Build folder and log file
2+
build/
3+
build.log

‎Bancha.gitignore‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#Logs
2+
application/logs/*.php
3+
4+
# Content types
5+
/application/xml/types/*.xml
6+
7+
# Custom builds and generated php files
8+
/core/documentation/build
9+
/core/views/admin/content/translations.php
10+
11+
# Attachs and cache files #
12+
*.tmp
13+
/attach/cache/
14+
/attach/
15+
/application/cache/_bancha/*.css
16+
/application/cache/_bancha/*.js

‎C++.gitignore‎

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

67
# Compiled Dynamic libraries
78
*.so
9+
*.dylib
10+
*.dll
811

912
# Compiled Static libraries
1013
*.lai
1114
*.la
1215
*.a
16+
*.lib
17+
18+
# Executables
19+
*.exe
20+
*.out
21+
*.app

‎C.gitignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
# Object files
22
*.o
3+
*.ko
4+
*.obj
35

46
# Libraries
57
*.lib
8+
*.a
69

710
# Shared objects (inc. Windows DLLs)
811
*.dll
912
*.so
13+
*.so.*
14+
*.dylib
1015

1116
# Executables
1217
*.exe
1318
*.out
14-
19+
*.app

‎CONTRIBUTING.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Since this repo includes a large and diverse number of programming languages, frameworks, editors, and ecosystems, it's *very helpful* if you can provide a link to information supporting your pull request. Up-to-date, canonical documentation that mentions the files to be ignored is best.
2+
3+
This ensures we can efficiently go through pull requests and keep quality high.

‎CSharp.gitignore‎

Lines changed: 0 additions & 97 deletions
This file was deleted.

‎CakePHP.gitignore‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
tmp/*
2-
config/database.php
2+
[Cc]onfig/core.php
3+
[Cc]onfig/database.php
34
app/tmp/*
4-
app/config/database.php
5-
!empty
5+
app/[Cc]onfig/core.php
6+
app/[Cc]onfig/database.php
7+
!empty

‎Concrete5.gitignore‎

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

0 commit comments

Comments
 (0)