Merge pull request #1 from github/master

ATN

Android.gitignore

@@ -21,3 +21,6 @@ local.properties
 
 # Proguard folder generated by Eclipse
 proguard/
+
+#Log Files
+*.log

CodeIgniter.gitignore

@@ -3,4 +3,4 @@
 */logs/!index.html
 */cache/*
 */cache/!index.html
-*/cache/!.htaccess
+*/cache/!.htaccess

Composer.gitignore

@@ -3,4 +3,4 @@ vendor/
 
 # Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
-# composer.lock
+# composer.lock

Elixir.gitignore

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

Global/Emacs.gitignore

@@ -21,3 +21,9 @@ tramp
 
 # elpa packages
 /elpa/
+
+# reftex files
+*.rel
+
+# AUCTeX auto folder
+/auto/

Global/IPythonNotebook.gitignore

@@ -0,0 +1,2 @@
+# Temporary data
+.ipynb_checkpoints/

Global/OSX.gitignore

@@ -2,7 +2,7 @@
 .AppleDouble
 .LSOverride
 
-# Icon must ends with two \r.
+# Icon must end with two \r
 Icon
 
 # Thumbnails

Global/Xcode.gitignore

@@ -11,3 +11,4 @@ xcuserdata
 *.xccheckout
 *.moved-aside
 DerivedData
+*.xcuserstate

Gradle.gitignore

@@ -1,2 +1,5 @@
 .gradle
 build/
+
+# Ignore Gradle GUI config
+gradle-app.setting

Laravel4.gitignore

@@ -0,0 +1,3 @@
+/bootstrap/compiled.php
+.env.*.php
+.env.php

Magento.gitignore

@@ -1,10 +1,8 @@
 .modgit/
-app/code/community/Find/
 app/code/community/Phoenix/
 app/code/community/Cm/
 app/code/core/
 app/design/adminhtml/default/default/
-app/design/adminhtml/default/find/
 app/design/frontend/base/
 app/design/frontend/default/blank/
 app/design/frontend/default/default/
@@ -13,7 +11,6 @@ app/design/frontend/default/modern/
 app/design/frontend/enterprise/default
 app/design/install/
 app/etc/modules/Enterprise_*
-app/etc/modules/Find_Feed.xml
 app/etc/modules/Mage_All.xml
 app/etc/modules/Mage_Api.xml
 app/etc/modules/Mage_Api2.xml

Mercury.gitignore

@@ -0,0 +1,11 @@
+Mercury/
+*.mh
+*.err
+*.init
+*.dll
+*.exe
+*.a
+*.so
+*.dylib
+*.d
+*.c_date

Node.gitignore

@@ -20,6 +20,9 @@ coverage
 build/Release
 
 # Dependency directory
-# Deployed apps should consider commenting this line out:
-# see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
+# Commenting this out is preferred by some people, see
+# https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
 node_modules
+
+# Users Environment Variables
+.lock-wscript

Objective-C.gitignore

@@ -15,11 +15,12 @@ xcuserdata
 DerivedData
 *.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?
+# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
 #
 # Pods/

Python.gitignore

@@ -8,7 +8,6 @@ __pycache__/
 # Distribution / packaging
 .Python
 env/
-bin/
 build/
 develop-eggs/
 dist/
@@ -36,19 +35,10 @@ coverage.xml
 
 # Translations
 *.mo
-
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
-
-# Rope
-.ropeproject
+*.pot
 
 # Django stuff:
 *.log
-*.pot
 
 # Sphinx documentation
 docs/_build/
-

ROS.gitignore

@@ -1,30 +1,25 @@
-~$
-.swp$
 build/
 bin/
 lib/
 msg_gen/
 srv_gen/
-msg/.*Action\.msg$
-msg/.*ActionFeedback\.msg$
-msg/.*ActionGoal\.msg$
-msg/.*ActionResult\.msg$
-msg/.*Feedback\.msg$
-msg/.*Goal\.msg$
-msg/.*Result\.msg$
-msg/_.*\.py$
-
-\.pcd$
-.pyc$
+msg/*Action.msg
+msg/*ActionFeedback.msg
+msg/*ActionGoal.msg
+msg/*ActionResult.msg
+msg/*Feedback.msg
+msg/*Goal.msg
+msg/*Result.msg
+msg/_*.py
 
 # Generated by dynamic reconfigure
-\.cfgc$
+*.cfgc
 /cfg/cpp/
-/cfg/.*\.py$
+/cfg/*.py
 
 # Ignore generated docs
-.dox$
-.wikidoc$
+*.dox
+*.wikidoc
 
 # eclipse stuff
 .project
@@ -33,9 +28,9 @@ msg/_.*\.py$
 # qcreator stuff
 CMakeLists.txt.user
 
-srv/_.*\.py$
-\.pcd$
-.pyc$
+srv/_*.py
+*.pcd
+*.pyc
 qtcreator-*
 *.user
 
@@ -43,7 +38,7 @@ qtcreator-*
 /planning/docs
 /planning/src
 
-*~$
+*~
 
 # Emacs
 .#*

Rails.gitignore

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

Symfony2.gitignore

@@ -13,4 +13,4 @@ app/config/parameters.ini
 app/config/parameters.yml
 
 # Composer
-composer.phar
+composer.phar

Umbraco.gitignore

@@ -1,9 +1,12 @@
-# Ignore Umbraco folders (Generated folders created by Umbraco)
-ClientDependency/
-TEMP/
-Logs/
+# Note: VisualStudio gitignore rules may also be relevant
+
+# Ignore unimportant folders generated by Umbraco
+**/App_Data/ClientDependency/
+**/App_Data/ExamineIndexes/
+**/App_Data/Logs/
+**/App_Data/[Pp]review/
+**/App_Data/TEMP/
 Cached/
-ExamineIndexes/
 
 # Ignore Umbraco content cache file
-umbraco.config
+**/App_Data/umbraco.config

VisualStudio.gitignore

@@ -10,12 +10,16 @@
 [Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
+[Rr]eleases/
 x64/
 build/
 bld/
 [Bb]in/
 [Oo]bj/
 
+# Roslyn cache directories
+*.ide/
+
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
@@ -120,16 +124,21 @@ 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
+## 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/*
-## TODO: If the tool you use requires repositories.config uncomment the next line
+## TODO: If the tool you use requires repositories.config
+## uncomment the next line
 #!packages/repositories.config
 
-# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
-# This line needs to be after the ignore of the build folder (and the packages folder if the line above has been uncommented)
+# Enable "build/" folder in the NuGet Packages folder since
+# NuGet packages use it for MSBuild targets.
+# This line needs to be after the ignore of the build folder
+# (and the packages folder if the line above has been uncommented)
 !packages/build/
 
 # Windows Azure Build Output
@@ -155,8 +164,9 @@ node_modules/
 # RIA/Silverlight projects
 Generated_Code/
 
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
 _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML

ZendFramework.gitignore

@@ -1,5 +1,20 @@
-INSTALL.txt
-LICENSE.txt
-README.txt
+# Composer files
+composer.phar
+vendor/
+
+# Local configs
+config/autoload/*local.php
+
+# Binary gettext files
+*.po
+
+# Data
+log/
+logs/
+cache/
+temp/
+tmp/
+
+# ZF1
 demos/
 extras/documentation