Skip to content

Commit 2813344

Browse files
wmarquardtwmarquardt
authored
Merge branch 'master' into codeigniter3update
2 parents f51de61 + 5b15028 commit 2813344

Some content is hidden

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

63 files changed

+595
-264
lines changed

‎Android.gitignore

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,20 @@ captures/
3535
# Intellij
3636
*.iml
3737
.idea/workspace.xml
38+
.idea/tasks.xml
39+
.idea/gradle.xml
40+
.idea/libraries
3841

3942
# Keystore files
4043
*.jks
44+
45+
# External native build folder generated in Android Studio 2.2 and later
46+
.externalNativeBuild
47+
48+
# Google Services (e.g. APIs or Firebase)
49+
google-services.json
50+
51+
#Freeline
52+
freeline.py
53+
freeline/
54+
freeline_project_description.json

‎Autotools.gitignore

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# http://www.gnu.org/software/automake
22

33
Makefile.in
4+
/ar-lib
5+
/mdate-sh
6+
/py-compile
7+
/test-driver
8+
/ylwrap
49

510
# http://www.gnu.org/software/autoconf
611

@@ -9,10 +14,20 @@ Makefile.in
914
/autoscan-*.log
1015
/aclocal.m4
1116
/compile
17+
/config.guess
1218
/config.h.in
19+
/config.sub
1320
/configure
1421
/configure.scan
1522
/depcomp
1623
/install-sh
1724
/missing
1825
/stamp-h1
26+
27+
# https://www.gnu.org/software/libtool/
28+
29+
/ltmain.sh
30+
31+
# http://www.gnu.org/software/texinfo
32+
33+
/texinfo.tex

‎C++.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Prerequisites
2+
*.d
3+
14
# Compiled Object files
25
*.slo
36
*.lo

‎C.gitignore

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
1+
# Prerequisites
2+
*.d
3+
14
# Object files
25
*.o
36
*.ko
47
*.obj
58
*.elf
69

10+
# Linker output
11+
*.ilk
12+
*.map
13+
*.exp
14+
715
# Precompiled Headers
816
*.gch
917
*.pch
@@ -31,3 +39,13 @@
3139
# Debug files
3240
*.dSYM/
3341
*.su
42+
*.idb
43+
*.pdb
44+
45+
# Kernel Module Compile Results
46+
*.mod*
47+
*.cmd
48+
modules.order
49+
Module.symvers
50+
Mkfile.old
51+
dkms.conf

‎CMake.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
CMakeCache.txt
22
CMakeFiles
33
CMakeScripts
4+
Testing
45
Makefile
56
cmake_install.cmake
67
install_manifest.txt
8+
compile_commands.json
79
CTestTestfile.cmake

‎CONTRIBUTING.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ high quality, we request that contributions adhere to the following guidelines.
2828
In general, the more you can do to help us understand the change you’re making,
2929
the more likely we’ll be to accept your contribution quickly.
3030

31+
If a template is mostly a list of files installed by a particular version of
32+
some software (e.g. a PHP framework) then it's brittle and probably no more
33+
helpful than a simple `ls`. If it's not possible to curate a small set of
34+
useful rules, then the template might not be a good fit for this collection.
35+
3136
Please also understand that we can’t list every tool that ever existed.
3237
Our aim is to curate a collection of the *most common and helpful* templates,
3338
not to make sure we cover every project possible. If we choose not to

‎CodeIgniter.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
!*/cache/index.html
66
!*/cache/.htaccess
77

8+
user_guide_src/build/*
9+
user_guide_src/cilexer/build/*
10+
user_guide_src/cilexer/dist/*
11+
user_guide_src/cilexer/pycilexer.egg-info/*
12+
813
#codeigniter 3
914
application/logs/*
1015
!application/logs/index.html

‎CommonLisp.gitignore

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
11
*.FASL
22
*.fasl
33
*.lisp-temp
4+
*.dfsl
5+
*.pfsl
6+
*.d64fsl
7+
*.p64fsl
8+
*.lx64fsl
9+
*.lx32fsl
10+
*.dx64fsl
11+
*.dx32fsl
12+
*.fx64fsl
13+
*.fx32fsl
14+
*.sx64fsl
15+
*.sx32fsl
16+
*.wx64fsl
17+
*.wx32fsl

‎Coq.gitignore

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1-
*.vo
1+
.*.aux
2+
*.a
3+
*.cma
4+
*.cmi
5+
*.cmo
6+
*.cmx
7+
*.cmxa
8+
*.cmxs
29
*.glob
10+
*.ml.d
11+
*.ml4.d
12+
*.mli.d
13+
*.mllib.d
14+
*.mlpack.d
15+
*.native
16+
*.o
317
*.v.d
18+
*.vio
19+
*.vo
20+
.coq-native/
21+
.csdp.cache
22+
.lia.cache
23+
.nia.cache
24+
.nlia.cache
25+
.nra.cache
26+
csdp.cache
27+
lia.cache
28+
nia.cache
29+
nlia.cache
30+
nra.cache

‎D.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@
1818
.dub
1919
docs.json
2020
__dummy.html
21+
docs/
22+
23+
# Code coverage
24+
*.lst

0 commit comments

Comments
 (0)