Merge remote-tracking branch 'github/master'

This commit is contained in:
Mike Duigou 2015-11-05 07:58:23 -08:00
commit c914c25e2d
54 changed files with 421 additions and 106 deletions

View File

@ -15,7 +15,6 @@ gen/
# Gradle files
.gradle/
build/
/*/build/
# Local configuration file (sdk path, etc)
local.properties
@ -25,3 +24,9 @@ proguard/
# Log Files
*.log
# Android Studio Navigation editor temp files
.navigation/
# Android Studio captures folder
captures/

View File

@ -1,14 +1,13 @@
*.tar
*.tar.*
*.jar
*.exe
*.msi
*.zip
*.tgz
*.log
*.log.*
*.sig
# AUR metadata
.AURINFO
.SRCINFO
pkg/
src/

View File

@ -27,3 +27,6 @@
*.i*86
*.x86_64
*.hex
# Debug files
*.dSYM/

View File

@ -1,5 +1,6 @@
CMakeCache.txt
CMakeFiles
CMakeScripts
Makefile
cmake_install.cmake
install_manifest.txt

6
CUDA.gitignore Normal file
View File

@ -0,0 +1,6 @@
*.i
*.ii
*.gpu
*.ptx
*.cubin
*.fatbin

View File

@ -1,11 +1,11 @@
CakePHP 3
# CakePHP 3
/vendor/*
/config/app.php
/tmp/*
/logs/*
CakePHP 2
# CakePHP 2
/app/tmp/*
/app/Config/core.php

View File

@ -1,6 +1,6 @@
*/config/development
*/logs/log-*.php
*/logs/!index.html
!*/logs/index.html
*/cache/*
*/cache/!index.html
*/cache/!.htaccess
!*/cache/index.html
!*/cache/.htaccess

20
D.gitignore Normal file
View File

@ -0,0 +1,20 @@
# Compiled Object files
*.o
*.obj
# Compiled Dynamic libraries
*.so
*.dylib
*.dll
# Compiled Static libraries
*.a
*.lib
# Executables
*.exe
# DUB
.dub
docs.json
__dummy.html

View File

@ -1,14 +1,27 @@
# Dont commit the following directories created by pub.
# See https://www.dartlang.org/tools/private-files.html
# Files and directories created by pub
.buildlog
.packages
.project
.pub/
build/
packages
**/packages/
# Or the files created by dart2js.
# Files created by dart2js
# (Most Dart developers will use pub build to compile Dart, use/modify these
# rules if you intend to use dart2js directly
# Convention is to use extension '.dart.js' for Dart compiled to Javascript to
# differentiate from explicit Javascript files)
*.dart.js
*.js_
*.part.js
*.js.deps
*.js.map
*.info.json
# Include when developing application packages.
# Directory created by dartdoc
doc/api/
# Don't commit pubspec lock file
# (Library packages only! Remove pattern if developing an application package)
pubspec.lock

View File

@ -53,5 +53,5 @@
__history/
*.~*
# Castalia statistics file
# Castalia statistics file (since XE7 Castalia is distributed with Delphi)
*.stat

View File

@ -1,4 +1,5 @@
/_build
/cover
/deps
erl_crash.dump
*.ez

5
Elm.gitignore Normal file
View File

@ -0,0 +1,5 @@
# elm-package generated files
elm-package.json
elm-stuff/
# elm-repl generated files
repl-temp-*

View File

@ -26,6 +26,9 @@ local.properties
# JDT-specific (Eclipse Java Development Tools)
.classpath
# Java annotation processor (APT)
.factorypath
# PDT-specific
.buildpath
@ -34,3 +37,6 @@ local.properties
# TeXlipse plugin
.texlipse
# STS (Spring Tool Suite)
.springBeans

View File

@ -1,3 +1,4 @@
# Ensime specific
.ensime
.ensime_cache/
.ensime_lucene/

2
Global/GPG.gitignore Normal file
View File

@ -0,0 +1,2 @@
secring.*

View File

@ -1,4 +1,4 @@
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
*.iml
@ -10,6 +10,7 @@
# .idea/workspace.xml
# .idea/tasks.xml
# .idea/dictionaries
# .idea/shelf
# Sensitive or high-churn files:
# .idea/dataSources.ids
@ -32,7 +33,7 @@
## Plugin-specific files:
# IntelliJ
out/
/out/
# mpeltonen/sbt-idea plugin
.idea_modules/
@ -44,3 +45,4 @@ atlassian-ide-plugin.xml
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

View File

@ -1,15 +1,30 @@
#ignore backup files
backup/
#ignore files generated by the compiler
lib/
# Lazarus compiler-generated binaries (safe to delete)
*.exe
*.dll
*.so
*.dylib
*.lrs
*.res
*.compiled
*.dbg
*.ppu
*.o
*.or
*.ppu
*.a
#ignore debug information files
*.dbg
# Lazarus autogenerated files (duplicated info)
*.rst
*.rsj
*.lrt
#exclude executable output in windows
*.exe
# Lazarus local files (user-specific info)
*.lps
# Lazarus backups and unit output folders.
# These can be changed by user in Lazarus/project options.
backup/
*.bak
lib/
# Application bundle for Mac OS
*.app/

View File

@ -1,3 +1,6 @@
/.hg/*
*/.hg/*
.hg/
.hgignore
.hgsigs
.hgsub
.hgsubstate
.hgtags

View File

@ -8,3 +8,6 @@
# Excel Backup File
*.xlk
# PowerPoint temporary
~$*.ppt*

1
Global/Otto.gitignore Normal file
View File

@ -0,0 +1 @@
.otto/

View File

@ -4,7 +4,7 @@ This directory contains globally useful gitignores,
e.g. OS-specific and editor specific.
For more on global gitignores:
<http://help.github.com/git-ignore/>
<https://help.github.com/articles/ignoring-files/#create-a-global-gitignore>
And a good blog post about 'em:
<http://augustl.com/blog/2009/global_gitignores>

View File

@ -1,23 +1,36 @@
# Waveforms
*.vpd
# Waveform formats
*.vcd
*.vpd
*.evcd
*.fsdb
# Binary files
# Default name of the simulation executable. A different name can be
# specified with this switch (the associated daidir database name is
# also taken from here): -o <path>/<filename>
simv
# Directories used for compilation
csrc/
# Generated for Verilog and VHDL top configs
simv.daidir/
simv.db.dir/
# Log files
# Infrastructure necessary to co-simulate SystemC models with
# Verilog/VHDL models. An alternate directory may be specified with this
# switch: -Mdir=<directory_path>
csrc/
# Log file - the following switch allows to specify the file that will be
# used to write all messages from simulation: -l <filename>
*.log
# DVE, UCLI related files
DVEfiles/
ucli*
*.key
# Coverage related files
# Coverage results (generated with urg) and database location. The
# following switch can also be used: urg -dir <coverage_directory>.vdb
simv.vdb/
urgReport/
# DVE and UCLI related files.
DVEfiles/
ucli.key
# When the design is elaborated for DirectC, the following file is created
# with declarations for C/C++ functions.
vc_hdrs.h

View File

@ -1,7 +1,9 @@
# Ignore tags created by etags, ctags, gtags (GNU global) and cscope
TAGS
.TAGS
!TAGS/
tags
.tags
!tags/
gtags.files
GTAGS

View File

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

View File

@ -0,0 +1,2 @@
.vscode

View File

@ -1,4 +1,12 @@
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
## Build generated
build/
DerivedData
## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
@ -8,7 +16,8 @@ build/
*.perspectivev3
!default.perspectivev3
xcuserdata
## Other
*.xccheckout
*.moved-aside
DerivedData
*.xcuserstate

View File

@ -22,3 +22,7 @@ _testmain.go
*.exe
*.test
*.prof
# GO15VENDOREXPERIMENT flag specifics
vendor/**
!vendor/manifest

View File

@ -6,3 +6,6 @@ gradle-app.setting
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar
# Cache of project
.gradletasknamecache

View File

@ -6,7 +6,6 @@ cabal-dev
*.chs.h
*.dyn_o
*.dyn_hi
.virtualenv
.hpc
.hsenv
.cabal-sandbox/
@ -14,3 +13,4 @@ cabal.sandbox.config
*.prof
*.aux
*.hp
.stack-work/

View File

@ -1,2 +1,3 @@
_site/
.sass-cache/
.jekyll-metadata

View File

@ -1,2 +0,0 @@
*.pyc
*.class

13
KiCAD.gitignore Normal file
View File

@ -0,0 +1,13 @@
# For PCBs designed using KiCAD: http://www.kicad-pcb.org/
# Temporary files
*.000
*.bak
*.bck
*.kicad_pcb-bak
# Netlist files (exported from Eeschema)
*.net
# Autorouter files (exported from Pcbnew)
.dsn

View File

@ -1,3 +1,14 @@
/bootstrap/compiled.php
vendor/
node_modules/
# Laravel 4 specific
bootstrap/compiled.php
app/storage/
# Laravel 5 & Lumen specific
bootstrap/cache/
storage/
.env.*.php
.env.php
.env
.env.example

View File

@ -89,7 +89,7 @@ LICENSE_AFL.txt
LICENSE.html
LICENSE.txt
LICENSE_EE*
mage
/mage
media/customer/
media/dhl/
media/downloadable/

View File

@ -5,3 +5,5 @@ pom.xml.versionsBackup
pom.xml.next
release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties

View File

@ -1,2 +0,0 @@
.meteor/local
.meteor/meteorite

View File

@ -1,6 +1,7 @@
# Logs
logs
*.log
npm-debug.log*
# Runtime data
pids
@ -23,5 +24,8 @@ coverage
build/Release
# Dependency directory
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
node_modules
# Optional npm cache directory
.npm

View File

@ -1,6 +1,12 @@
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
## Build generated
build/
DerivedData
## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
@ -10,17 +16,36 @@ build/
*.perspectivev3
!default.perspectivev3
xcuserdata
## Other
*.xccheckout
*.moved-aside
DerivedData
*.xcuserstate
*.xcscmblueprint
## Obj-C/Swift specific
*.hmap
*.ipa
*.xcuserstate
# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/
# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts
Carthage/Build
# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
fastlane/report.xml
fastlane/screenshots

View File

@ -11,7 +11,6 @@ bin/
tmp/
test-result
server.pid
*.iml
*.eml
/dist/
.cache

View File

@ -1,29 +1,25 @@
# Directories content
cache/class_index.php
cache/smarty/cache/*
!cache/smarty/cache/index.php
cache/smarty/compile/*
!cache/smarty/compile/index.php
cache/tcpdf/*
!cache/tcpdf/index.php
# Private files
# The following files contain your database credentials and other personal data.
config/settings.*.php
# Cache, temp and generated files
# The following files are generated by PrestaShop.
admin-dev/autoupgrade/
/cache/*
config/xml/*.xml
config/settings.inc.php
/log/*
*sitemap.xml
themes/*/cache/
modules/*/config*.xml
log/*.log
# Site content
# The following folders contain product images, virtual products, CSV's, etc.
img/*
!img/index.php
!img/*/index.php
tools/smarty*/cache/*.php
!tools/smarty*/cache/index.php
tools/smarty*/compile/*.php
!tools/smarty*/compile/index.php
themes/default/cache/*.js
themes/default/cache/*.css
# Ignore files on root directory
robots.txt
sitemap.xml
admin-dev/backups/
admin-dev/export/
admin-dev/import/
download/
/img/*
upload/

View File

@ -1,6 +1,7 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class
# C extensions
*.so
@ -41,6 +42,8 @@ htmlcov/
.cache
nosetests.xml
coverage.xml
*,cover
.hypothesis/
# Translations
*.mo

View File

@ -2,6 +2,9 @@
.Rhistory
.Rapp.history
# Session Data files
.RData
# Example code in package build process
*-Ex.R
@ -11,3 +14,6 @@
# produced vignettes
vignettes/*.html
vignettes/*.pdf
# OAuth2 token, see https://github.com/hadley/httr/releases/tag/v0.3
.httr-oauth

View File

@ -31,17 +31,17 @@ high quality, we request that contributions adhere to the following guidelines.
- **Provide a link to the application or projects homepage**. Unless its
extremely popular, theres a chance the maintainers dont know about or use
the language, framework, editor, app, or project your change applies to.
- **Provide links to documentation** supporting the change youre making.
Current, canonical documentation mentioning the files being ignored is best.
If documentation isnt available to support your change, do the best you can
to explain what the files being ignored are for.
- **Explain why youre making a change**. Even if it seems self-evident, please
take a sentence or two to tell us why your change or addition should happen.
Its especially helpful to articulate why this change applies to *everyone*
who works with the applicable technology, rather than just you or your team.
- **Please consider the scope of your change**. If your change specific to a
certain language or framework, then make sure the change is made to the
template for that language or framework, rather than to the template for an
@ -70,9 +70,9 @@ Heres how we suggest you go about proposing a change to this project:
Using the web-based interface to make changes is fine too, and will help you
by automatically forking the project and prompting to send a pull request too.
[fork]: http://help.github.com/forking/
[fork]: https://help.github.com/articles/fork-a-repo/
[branch]: https://help.github.com/articles/creating-and-deleting-branches-within-your-repository
[pr]: http://help.github.com/pull-requests/
[pr]: https://help.github.com/articles/using-pull-requests/
## License

View File

@ -5,6 +5,7 @@
/InstalledFiles
/pkg/
/spec/reports/
/spec/examples.txt
/test/tmp/
/test/version_tmp/
/tmp/

View File

@ -1,2 +1,2 @@
.sass-cache
.sass-cache/
*.css.map

View File

@ -1,6 +1,12 @@
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
## Build generated
build/
DerivedData
## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
@ -10,18 +16,22 @@ build/
*.perspectivev3
!default.perspectivev3
xcuserdata
## Other
*.xccheckout
*.moved-aside
DerivedData
*.xcuserstate
*.xcscmblueprint
## Obj-C/Swift specific
*.hmap
*.ipa
*.xcuserstate
# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/
@ -31,3 +41,11 @@ DerivedData
# Carthage/Checkouts
Carthage/Build
# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
fastlane/report.xml
fastlane/screenshots

View File

@ -26,6 +26,9 @@
/web/bundles/
/web/uploads/
# Assets managed by Bower
/web/assets/vendor/
# PHPUnit
/app/phpunit.xml
/phpunit.xml

View File

@ -33,6 +33,7 @@
## Auxiliary and intermediate files from other packages:
# algorithms
*.alg
*.loa
@ -93,7 +94,8 @@ acs-*.bib
# minitoc
*.maf
*.mtc
*.mtc0
*.mtc[0-9]
*.mtc[1-9][0-9]
# minted
_minted*
@ -102,6 +104,9 @@ _minted*
# morewrites
*.mw
# mylatexformat
*.fmt
# nomencl
*.nlo
@ -115,6 +120,18 @@ _minted*
*.sympy
sympy-plots-for-*.tex/
#pythontex
*.pytxcode
pythontex-files-*/
# Texpad
.texpadtmp
# TikZ & PGF
*.dpth
*.md5
*.auxlock
# todonotes
*.tdo

View File

@ -1,18 +1,20 @@
## TYPO3 v4
## TYPO3 v6.2
# Ignore serveral upload and file directories.
/fileadmin/user_upload/
/fileadmin/_temp_/
/fileadmin/_processed_/
/uploads/
# Ignore cache
/typo3conf/temp_CACHED*
/typo3conf/temp_fieldInfo.php
# Ignore local config which overrides typo3 config.
# You should include your local stuff with `@include('localconf_local.php');` at the end of localconf.php.
# See http://stackoverflow.com/questions/11905360/how-best-to-manage-typo3-installations-using-git for details.
/typo3conf/localconf_local.php
/typo3conf/deprecation_*.log
/typo3conf/AdditionalConfiguration.php
# Ignore system folders, you should have them symlinked.
# If not comment out the following two entries.
# If not comment out the following entries.
/typo3
/t3lib
/typo3_src
/typo3_src-*
/.htaccess
/index.php
# Ignore temp directory.
/typo3temp/

View File

@ -1,7 +1,7 @@
[Ll]ibrary/
[Tt]emp/
[Oo]bj/
[Bb]uild/
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
# Autogenerated VS/MD solution and project files
*.csproj

58
UnrealEngine.gitignore Normal file
View File

@ -0,0 +1,58 @@
# Compiled Object files
*.slo
*.lo
*.o
*.obj
# Precompiled Headers
*.gch
*.pch
# Compiled Dynamic libraries
*.so
*.dylib
*.dll
# Fortran module files
*.mod
# Compiled Static libraries
*.lai
*.la
*.a
*.lib
# Executables
*.exe
*.out
*.app
*.ipa
# These project files can be generated by the engine
*.xcodeproj
*.sln
*.suo
*.opensdf
*.sdf
# Precompiled Assets
SourceArt/**/*.png
SourceArt/**/*.tga
# Binary Files
Binaries/*
# Builds
Build/*
# Don't ignore icon files in Build
!Build/**/*.ico
# Configuration files generated by the Editor
Saved/*
# Compiled source files for the engine to use
Intermediate/*
# Cache files for the editor to use
DerivedDataCache/*

View File

@ -22,8 +22,10 @@ bld/
[Bb]in/
[Oo]bj/
# Visual Studo 2015 cache/options directory
# Visual Studio 2015 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/
# MSTest test Results
[Tt]est[Rr]esult*/
@ -38,6 +40,10 @@ TestResult.xml
[Rr]eleasePS/
dlldata.c
# DNX
project.lock.json
artifacts/
*_i.c
*_p.c
*_i.h
@ -78,6 +84,7 @@ ipch/
*.psess
*.vsp
*.vspx
*.sap
# TFS 2012 Local Workspace
$tf/
@ -90,7 +97,7 @@ _ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user
# JustCode is a .NET coding addin-in
# JustCode is a .NET coding add-in
.JustCode
# TeamCity is a build add-in
@ -102,6 +109,7 @@ _TeamCity*
# NCrunch
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*
# MightyMoose
*.mm.*
@ -147,11 +155,20 @@ publish/
csx/
*.build.csdef
# Windows Azure Emulator
efc/
rfc/
# Windows Store app package directory
AppPackages/
# Others
# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/
# Others
ClientBin/
[Ss]tyle[Cc]op.*
~$*
@ -161,7 +178,7 @@ ClientBin/
*.pfx
*.publishsettings
node_modules/
bower_components/
orleans.codegen.cs
# RIA/Silverlight projects
Generated_Code/
@ -186,6 +203,9 @@ UpgradeLog*.htm
# Microsoft Fakes
FakesAssemblies/
# GhostDoc plugin setting file
*.GhostDoc.xml
# Node.js Tools for Visual Studio
.ntvs_analysis.dat
@ -194,3 +214,17 @@ FakesAssemblies/
# Visual Studio 6 workspace options file
*.opt
# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions
# Paket dependency manager
.paket/paket.exe
# FAKE - F# Make
.fake/

View File

@ -1,3 +1,4 @@
# for projects that use Waf for building: http://code.google.com/p/waf/
.waf-*
.waf3-*
.lock-*

View File

@ -11,3 +11,8 @@ wp-content/cache/
wp-content/upgrade/
wp-content/uploads/
wp-content/wp-cache-config.php
wp-content/plugins/hello.php
/readme.html
/license.txt