Merge pull request #1 from github/master

Updating fork

ArchLinuxPackages.gitignore

@@ -1,5 +1,7 @@
 *.tar
 *.tar.*
+*.zip
+*.tgz
 *.log
 *.log.*
 *.sig

Dart.gitignore

@@ -1,11 +1,13 @@
-# Don’t commit the following files and directories created by pub and dart2js
+# Don’t commit the following directories created by pub.
+build/
 packages/
+
+# Or the files created by dart2js.
+*.dart.js
+*.dart.precompiled.js
 *.js_
 *.js.deps
 *.js.map
 
-# Include when developing application packages
+# Include when developing application packages.
 pubspec.lock
-
-# Avoid committing generated JavaScript files
-*.dart.js

Delphi.gitignore

@@ -35,6 +35,7 @@
 *.dres
 *.rsm
 *.tds
+*.dcu
 
 # Delphi autogenerated files (duplicated info)
 *.cfg

Drupal.gitignore

@@ -2,7 +2,6 @@
 sites/*/*settings*.php
 
 # Ignore paths that contain generated content.
-cache/
 files/
 sites/*/files
 sites/*/private

Global/FlexBuilder.gitignore

@@ -1,2 +1,3 @@
 bin/
 bin-debug/
+bin-release/

Global/OSX.gitignore

@@ -11,3 +11,10 @@ Icon
 # Files that might appear on external disk
 .Spotlight-V100
 .Trashes
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+

Global/SlickEdit.gitignore

@@ -0,0 +1,11 @@
+# SlickEdit workspace and project files are ignored by default because
+# typically they are considered to be developer-specific and not part of a
+# project.
+*.vpw
+*.vpj
+
+# SlickEdit workspace history and tag files always contain user-specific
+# data so they should not be stored in a repository.
+*.vpwhistu
+*.vpwhist
+*.vtg

Global/SublimeText.gitignore

@@ -4,3 +4,6 @@
 # project files should be checked into the repository, unless a significant
 # proportion of contributors will probably not be using SublimeText
 # *.sublime-project
+
+#sftp configuration file
+sftp-config.json

Global/Xcode.gitignore

@@ -0,0 +1,13 @@
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData

Maven.gitignore

@@ -1,5 +1,6 @@
 target/
 pom.xml.tag
 pom.xml.releaseBackup
+pom.xml.versionsBackup
 pom.xml.next
 release.properties

Objective-C.gitignore

@@ -1,4 +1,5 @@
 # Xcode
+#
 build/
 *.pbxuser
 !default.pbxuser
@@ -10,11 +11,15 @@ build/
 !default.perspectivev3
 xcuserdata
 *.xccheckout
-profile
 *.moved-aside
 DerivedData
 *.hmap
 *.ipa
 
 # CocoaPods
-Pods
+#
+# 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?
+#
+# Pods/

OpenCart.gitignore

@@ -0,0 +1,11 @@
+.htaccess
+config.php
+admin/config.php
+
+!index.html
+
+download/
+image/data/
+image/cache/
+system/cache/
+system/logs/

Packer.gitignore

@@ -0,0 +1,5 @@
+# Cache objects
+packer_cache/
+
+# For built boxes
+*.box

Phalcon.gitignore

@@ -0,0 +1,2 @@
+/cache/
+/config/development/

PlayFramework.gitignore

@@ -1,19 +1,17 @@
 # Ignore Play! working directory #
-bin
-db
-eclipse
-lib
-log
-logs
-modules
-precompiled
-project/project
-project/target
-target
-tmp
+bin/
+/db
+.eclipse
+/lib/
+/logs/
+/modules
+/project/project
+/project/target
+/target
+tmp/
 test-result
 server.pid
 *.iml
 *.eml
-dist
+/dist/
 .cache

Qt.gitignore

@@ -12,8 +12,11 @@
 
 # Qt-es
 
+/.qmake.cache
+/.qmake.stash
 *.pro.user
 *.pro.user.*
+*.moc
 moc_*.cpp
 qrc_*.cpp
 ui_*.h

R.gitignore

@@ -3,3 +3,6 @@
 
 # Example code in package build process
 *-Ex.R
+
+# R data files from past sessions
+.Rdata

Rails.gitignore

@@ -10,6 +10,8 @@ capybara-*.html
 **.orig
 rerun.txt
 pickle-email-*.html
+
+# TODO Comment out this rules if you are OK with secrets been uploaded to the repo
 config/initializers/secret_token.rb
 config/secrets.yml
 

TeX.gitignore

@@ -72,6 +72,16 @@
 # nomencl
 *.nlo
 
+# sagetex
+*.sagetex.sage
+*.sagetex.py
+*.sagetex.scmd
+
+# sympy
+*.sout
+*.sympy
+sympy-plots-for-*.tex/
+
 # todonotes
 *.tdo
 

VVVV.gitignore

@@ -4,4 +4,3 @@
 
 # Dynamic plugins .dll
 bin/
-

VisualStudio.gitignore

@@ -91,7 +91,6 @@ _TeamCity*
 *.dotCover
 
 # NCrunch
-*.ncrunch*
 _NCrunch_*
 .*crunch*.local.xml
 
@@ -121,6 +120,8 @@ publish/
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
+## TODO: Comment the next line if you want to checkin your web deploy settings but do note that will include unencrypted passwords
+*.pubxml
 
 # NuGet Packages Directory
 packages/

opencart.gitignore

@@ -1,10 +0,0 @@
-config.php
-admin/config.php
-
-!index.html
-
-download
-image/cache/*.jpg
-image/cache/data/*
-system/cache
-system/logs