Merge branch 'master' into update-license

This commit is contained in:
Brendan Forster 2016-01-18 11:00:05 +11:00
commit dd83dbdf60
9 changed files with 37 additions and 12 deletions

View File

@ -1,6 +1,5 @@
*.pydevproject
.metadata .metadata
.gradle
bin/ bin/
tmp/ tmp/
*.tmp *.tmp
@ -20,7 +19,10 @@ local.properties
# Locally stored "Eclipse launch configurations" # Locally stored "Eclipse launch configurations"
*.launch *.launch
# CDT-specific # PyDev specific (Python IDE for Eclipse)
*.pydevproject
# CDT-specific (C/C++ Development Tooling)
.cproject .cproject
# JDT-specific (Eclipse Java Development Tools) # JDT-specific (Eclipse Java Development Tools)
@ -29,7 +31,7 @@ local.properties
# Java annotation processor (APT) # Java annotation processor (APT)
.factorypath .factorypath
# PDT-specific # PDT-specific (PHP Development Tools)
.buildpath .buildpath
# sbteclipse plugin # sbteclipse plugin

View File

@ -1,5 +1,8 @@
*~ *~
# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*
# KDE directory preferences # KDE directory preferences
.directory .directory

View File

@ -4,6 +4,7 @@
[Bb]in [Bb]in
[Ii]nclude [Ii]nclude
[Ll]ib [Ll]ib
[Ll]ib64
[Ll]ocal [Ll]ocal
[Ss]cripts [Ss]cripts
pyvenv.cfg pyvenv.cfg

View File

@ -543,4 +543,4 @@
/index.php /index.php
/joomla.xml /joomla.xml
/*.txt /*.txt
/robots.txt.dist /robots.txt.dist

View File

@ -24,7 +24,6 @@ coverage
build/Release build/Release
# Dependency directory # Dependency directory
# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
node_modules node_modules
# Optional npm cache directory # Optional npm cache directory

View File

@ -57,3 +57,6 @@ docs/_build/
# PyBuilder # PyBuilder
target/ target/
#Ipython Notebook
.ipynb_checkpoints

View File

@ -27,6 +27,10 @@ xcuserdata
*.hmap *.hmap
*.ipa *.ipa
## Playgrounds
timeline.xctimeline
playground.xcworkspace
# Swift Package Manager # Swift Package Manager
# #
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies. # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.

View File

@ -6,6 +6,7 @@
*.fls *.fls
*.out *.out
*.toc *.toc
*.fmt
## Intermediate documents: ## Intermediate documents:
*.dvi *.dvi
@ -32,8 +33,6 @@
*.pdfsync *.pdfsync
## Auxiliary and intermediate files from other packages: ## Auxiliary and intermediate files from other packages:
# algorithms # algorithms
*.alg *.alg
*.loa *.loa
@ -49,6 +48,9 @@ acs-*.bib
*.snm *.snm
*.vrb *.vrb
# cprotect
*.cpt
#(e)ledmac/(e)ledpar #(e)ledmac/(e)ledpar
*.end *.end
*.[1-9] *.[1-9]
@ -142,6 +144,9 @@ pythontex-files-*/
# xindy # xindy
*.xdy *.xdy
# xypic precompiled matrices
*.xyc
# WinEdt # WinEdt
*.bak *.bak
*.sav *.sav
@ -149,3 +154,6 @@ pythontex-files-*/
# endfloat # endfloat
*.ttt *.ttt
*.fff *.fff
# Latexian
TSWLatexianTemp*

View File

@ -17,7 +17,6 @@
[Rr]eleases/ [Rr]eleases/
x64/ x64/
x86/ x86/
build/
bld/ bld/
[Bb]in/ [Bb]in/
[Oo]bj/ [Oo]bj/
@ -151,17 +150,24 @@ publish/
!**/packages/build/ !**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed # Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config #!**/packages/repositories.config
# NuGet v3's project.json files produces more ignoreable files
*.nuget.props
*.nuget.targets
# Windows Azure Build Output # Microsoft Azure Build Output
csx/ csx/
*.build.csdef *.build.csdef
# Windows Azure Emulator # Microsoft Azure Emulator
ecf/ ecf/
rcf/ rcf/
# Microsoft Azure ApplicationInsights config file
ApplicationInsights.config
# Windows Store app package directory # Windows Store app package directory
AppPackages/ AppPackages/
BundleArtifacts/
# Visual Studio cache files # Visual Studio cache files
# files ending in .cache can be ignored # files ending in .cache can be ignored
@ -171,7 +177,6 @@ AppPackages/
# Others # Others
ClientBin/ ClientBin/
[Ss]tyle[Cc]op.*
~$* ~$*
*~ *~
*.dbmdl *.dbmdl