Skip to content

Commit dd83dbd

Browse files
committed
Merge branch 'master' into update-license
2 parents 382c3e0 + e4c0ed3 commit dd83dbd

File tree

9 files changed

+37
-12
lines changed

9 files changed

+37
-12
lines changed

Global/Eclipse.gitignore

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
*.pydevproject
1+
22
.metadata
3-
.gradle
43
bin/
54
tmp/
65
*.tmp
@@ -20,7 +19,10 @@ local.properties
2019
# Locally stored "Eclipse launch configurations"
2120
*.launch
2221

23-
# CDT-specific
22+
# PyDev specific (Python IDE for Eclipse)
23+
*.pydevproject
24+
25+
# CDT-specific (C/C++ Development Tooling)
2426
.cproject
2527

2628
# JDT-specific (Eclipse Java Development Tools)
@@ -29,7 +31,7 @@ local.properties
2931
# Java annotation processor (APT)
3032
.factorypath
3133

32-
# PDT-specific
34+
# PDT-specific (PHP Development Tools)
3335
.buildpath
3436

3537
# sbteclipse plugin

Global/Linux.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
*~
22

3+
# temporary files which can be created if a process still has a handle open of a deleted file
4+
.fuse_hidden*
5+
36
# KDE directory preferences
47
.directory
58

Global/VirtualEnv.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
[Bb]in
55
[Ii]nclude
66
[Ll]ib
7+
[Ll]ib64
78
[Ll]ocal
89
[Ss]cripts
910
pyvenv.cfg

Joomla.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,4 +543,4 @@
543543
/index.php
544544
/joomla.xml
545545
/*.txt
546-
/robots.txt.dist
546+
/robots.txt.dist

Node.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ coverage
2424
build/Release
2525

2626
# Dependency directory
27-
# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
2827
node_modules
2928

3029
# Optional npm cache directory

Python.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,6 @@ docs/_build/
5757

5858
# PyBuilder
5959
target/
60+
61+
#Ipython Notebook
62+
.ipynb_checkpoints

Swift.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ xcuserdata
2727
*.hmap
2828
*.ipa
2929

30+
## Playgrounds
31+
timeline.xctimeline
32+
playground.xcworkspace
33+
3034
# Swift Package Manager
3135
#
3236
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.

TeX.gitignore

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*.fls
77
*.out
88
*.toc
9+
*.fmt
910

1011
## Intermediate documents:
1112
*.dvi
@@ -32,8 +33,6 @@
3233
*.pdfsync
3334

3435
## Auxiliary and intermediate files from other packages:
35-
36-
3736
# algorithms
3837
*.alg
3938
*.loa
@@ -49,6 +48,9 @@ acs-*.bib
4948
*.snm
5049
*.vrb
5150

51+
# cprotect
52+
*.cpt
53+
5254
#(e)ledmac/(e)ledpar
5355
*.end
5456
*.[1-9]
@@ -142,10 +144,16 @@ pythontex-files-*/
142144
# xindy
143145
*.xdy
144146

147+
# xypic precompiled matrices
148+
*.xyc
149+
145150
# WinEdt
146151
*.bak
147152
*.sav
148153

149154
# endfloat
150155
*.ttt
151156
*.fff
157+
158+
# Latexian
159+
TSWLatexianTemp*

VisualStudio.gitignore

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
[Rr]eleases/
1818
x64/
1919
x86/
20-
build/
2120
bld/
2221
[Bb]in/
2322
[Oo]bj/
@@ -151,17 +150,24 @@ publish/
151150
!**/packages/build/
152151
# Uncomment if necessary however generally it will be regenerated when needed
153152
#!**/packages/repositories.config
153+
# NuGet v3's project.json files produces more ignoreable files
154+
*.nuget.props
155+
*.nuget.targets
154156

155-
# Windows Azure Build Output
157+
# Microsoft Azure Build Output
156158
csx/
157159
*.build.csdef
158160

159-
# Windows Azure Emulator
161+
# Microsoft Azure Emulator
160162
ecf/
161163
rcf/
162164

165+
# Microsoft Azure ApplicationInsights config file
166+
ApplicationInsights.config
167+
163168
# Windows Store app package directory
164169
AppPackages/
170+
BundleArtifacts/
165171

166172
# Visual Studio cache files
167173
# files ending in .cache can be ignored
@@ -171,7 +177,6 @@ AppPackages/
171177

172178
# Others
173179
ClientBin/
174-
[Ss]tyle[Cc]op.*
175180
~$*
176181
*~
177182
*.dbmdl

0 commit comments

Comments
 (0)