Merge branch 'master' of https://github.com/github/gitignore

2014-01-30 16:40:43 -05:00 · 2014-01-30 16:40:43 -05:00 · b99887e1de
parent 7e2dc593fe ea1dc4f7eb
commit b99887e1de
36 changed files with 657 additions and 442 deletions
--- a/Ada.gitignore
+++ b/Ada.gitignore
@ -0,0 +1,5 @@
+# Object file
+*.o
+
+# Ada Library Information
+*.ali
--- a/Android.gitignore
+++ b/Android.gitignore
@ -1,18 +1,18 @@
-# built application files
+# Built application files
 *.apk
 *.ap_

-# files for the dex VM
+# Files for the Dalvik VM
 *.dex

 # Java class files
 *.class

-# generated files
+# Generated files
 bin/
 gen/

-# Ignore gradle files
+# Gradle files
 .gradle/
 build/

--- a/ArchLinuxPackages.gitignore
+++ b/ArchLinuxPackages.gitignore
@ -0,0 +1,7 @@
+*.tar
+*.tar.*
+*.log
+*.log.*
+*.sig
+pkg/
+src/
--- a/C.gitignore
+++ b/C.gitignore
@ -18,4 +18,6 @@
 *.exe
 *.out
 *.app
+*.i*86
+*.x86_64
 *.hex
--- a/ChefCookbook.gitignore
+++ b/ChefCookbook.gitignore
@ -0,0 +1,17 @@
+.vagrant
+Berksfile.lock
+*~
+*#
+.#*
+\#*#
+.*.sw[a-z]
+*.un~
+/cookbooks
+
+# Bundler
+Gemfile.lock
+bin/*
+.bundle/*
+
+.kitchen/
+.kitchen.local.yml
--- a/CommonLisp.gitignore
+++ b/CommonLisp.gitignore
@ -0,0 +1,3 @@
+*.FASL
+*.fasl
+*.lisp-temp
--- a/Dart.gitignore
+++ b/Dart.gitignore
@ -1,7 +1,5 @@
-// Don’t commit the following files and directories created by pub, Dart Editor, and dart2js
+// Don’t commit the following files and directories created by pub and dart2js
 packages/
-.project
-.buildlog
 *.js_
 *.js.deps
 *.js.map
@ -11,6 +9,3 @@ pubspec.lock

 // Avoid committing generated JavaScript files
 *.dart.js
-
-// Check for any other incovenient files generated by OS 
-// and other tools such as Eclipse, IntelliJ, etc.
--- a/Delphi.gitignore
+++ b/Delphi.gitignore
@ -7,4 +7,8 @@ __history
 *.map
 *.exe
 *.dll
+*.bpl
+*.dcp
+*.so
+*.apk
 bin/*
--- a/Elisp.gitignore
+++ b/Elisp.gitignore
@ -0,0 +1,2 @@
+# Compiled
+*.elc
--- a/GWT.gitignore
+++ b/GWT.gitignore
@ -14,3 +14,15 @@ gwt-unitCache/
 # more caches and things from deploy #
 war/WEB-INF/deploy/
 war/WEB-INF/classes/
+
+#compilation logs
+.gwt/
+
+#caching for already compiled files
+gwt-unitCache/
+
+#gwt junit compilation files
+www-test/
+
+#old GWT (1.5) created this dir
+.gwt-tmp/
--- a/Global/Cloud9.gitignore
+++ b/Global/Cloud9.gitignore
@ -1,2 +1,3 @@
 # Cloud9 IDE - http://c9.io
 .c9revisions
+.c9
--- a/Global/DartEditor.gitignore
+++ b/Global/DartEditor.gitignore
@ -0,0 +1,2 @@
+.project
+.buildlog
--- a/Global/Dreamweaver.gitignore
+++ b/Global/Dreamweaver.gitignore
@ -0,0 +1,3 @@
+# DW Dreamweaver added files
+_notes
+dwsync.xml
--- a/Global/Eclipse.gitignore
+++ b/Global/Eclipse.gitignore
@ -1,9 +1,8 @@
 *.pydevproject
 .metadata
 .gradle
-bin/**
-tmp/**
-tmp/**/*
+bin/
+tmp/
 *.tmp
 *.bak
 *.swp
@ -24,5 +23,8 @@ local.properties
 # PDT-specific
 .buildpath

+# sbteclipse plugin 
+.target
+
 # TeXlipse plugin
 .texlipse
--- a/Global/Emacs.gitignore
+++ b/Global/Emacs.gitignore
@ -14,3 +14,10 @@ tramp

 # flymake-mode
 *_flymake.*
+
+# eshell files
+/eshell/history
+/eshell/lastdir
+
+# elpa packages
+/elpa/
--- a/Global/Lazarus.gitignore
+++ b/Global/Lazarus.gitignore
@ -0,0 +1,12 @@
+#ignore backup files
+backup/
+
+#ignore files generated by the compiler
+lib/
+*.compiled
+*.o
+*.or
+*.ppu
+
+#exclude executable output in windows
+*.exe
--- a/Gradle.gitignore
+++ b/Gradle.gitignore
@ -0,0 +1,2 @@
+.gradle
+build/
--- a/Grails.gitignore
+++ b/Grails.gitignore
@ -28,8 +28,9 @@
 # project release file
 /*.war

-# plugin release file
+# plugin release files
 /*.zip
+/plugin.xml

 # older plugin install locations
 /plugins
--- a/Java.gitignore
+++ b/Java.gitignore
@ -1,5 +1,8 @@
 *.class

+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
 # Package Files #
 *.jar
 *.war
--- a/Joomla.gitignore
+++ b/Joomla.gitignore
@ -1,396 +1,437 @@
-.gitignore
-.htaccess
-administrator/cache/*
-administrator/components/com_admin/*
-administrator/components/com_banners/*
-administrator/components/com_cache/*
-administrator/components/com_categories/*
-administrator/components/com_checkin/*
-administrator/components/com_config/*
-administrator/components/com_contact/*
-administrator/components/com_content/*
-administrator/components/com_cpanel/*
-administrator/components/com_installer/*
-administrator/components/com_languages/*
-administrator/components/com_login/*
-administrator/components/com_media/*
-administrator/components/com_menus/*
-administrator/components/com_messages/*
-administrator/components/com_modules/*
-administrator/components/com_newsfeeds/*
-administrator/components/com_plugins/*
-administrator/components/com_redirect/*
-administrator/components/com_search/*
-administrator/components/com_templates/*
-administrator/components/com_users/*
-administrator/components/com_weblinks/*
-administrator/components/index.html
-administrator/help/*
-administrator/includes/*
-administrator/language/en-GB/
-administrator/language/en-GB/en-GB.com_admin.ini
-administrator/language/en-GB/en-GB.com_admin.sys.ini
-administrator/language/en-GB/en-GB.com_banners.ini
-administrator/language/en-GB/en-GB.com_banners.sys.ini
-administrator/language/en-GB/en-GB.com_cache.ini
-administrator/language/en-GB/en-GB.com_cache.sys.ini
-administrator/language/en-GB/en-GB.com_categories.ini
-administrator/language/en-GB/en-GB.com_categories.sys.ini
-administrator/language/en-GB/en-GB.com_checkin.ini
-administrator/language/en-GB/en-GB.com_checkin.sys.ini
-administrator/language/en-GB/en-GB.com_config.ini
-administrator/language/en-GB/en-GB.com_config.sys.ini
-administrator/language/en-GB/en-GB.com_contact.ini
-administrator/language/en-GB/en-GB.com_contact.sys.ini
-administrator/language/en-GB/en-GB.com_content.ini
-administrator/language/en-GB/en-GB.com_content.sys.ini
-administrator/language/en-GB/en-GB.com_cpanel.ini
-administrator/language/en-GB/en-GB.com_cpanel.sys.ini
-administrator/language/en-GB/en-GB.com_installer.ini
-administrator/language/en-GB/en-GB.com_installer.sys.ini
-administrator/language/en-GB/en-GB.com_languages.ini
-administrator/language/en-GB/en-GB.com_languages.sys.ini
-administrator/language/en-GB/en-GB.com_login.ini
-administrator/language/en-GB/en-GB.com_login.sys.ini
-administrator/language/en-GB/en-GB.com_mailto.sys.ini
-administrator/language/en-GB/en-GB.com_media.ini
-administrator/language/en-GB/en-GB.com_media.sys.ini
-administrator/language/en-GB/en-GB.com_menus.ini
-administrator/language/en-GB/en-GB.com_menus.sys.ini
-administrator/language/en-GB/en-GB.com_messages.ini
-administrator/language/en-GB/en-GB.com_messages.sys.ini
-administrator/language/en-GB/en-GB.com_modules.ini
-administrator/language/en-GB/en-GB.com_modules.sys.ini
-administrator/language/en-GB/en-GB.com_newsfeeds.ini
-administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini
-administrator/language/en-GB/en-GB.com_plugins.ini
-administrator/language/en-GB/en-GB.com_plugins.sys.ini
-administrator/language/en-GB/en-GB.com_redirect.ini
-administrator/language/en-GB/en-GB.com_redirect.sys.ini
-administrator/language/en-GB/en-GB.com_search.ini
-administrator/language/en-GB/en-GB.com_search.sys.ini
-administrator/language/en-GB/en-GB.com_templates.ini
-administrator/language/en-GB/en-GB.com_templates.sys.ini
-administrator/language/en-GB/en-GB.com_users.ini
-administrator/language/en-GB/en-GB.com_users.sys.ini
-administrator/language/en-GB/en-GB.com_weblinks.ini
-administrator/language/en-GB/en-GB.com_weblinks.sys.ini
-administrator/language/en-GB/en-GB.com_wrapper.ini
-administrator/language/en-GB/en-GB.com_wrapper.sys.ini
-administrator/language/en-GB/en-GB.ini
-administrator/language/en-GB/en-GB.lib_joomla.ini
-administrator/language/en-GB/en-GB.localise.php
-administrator/language/en-GB/en-GB.mod_custom.ini
-administrator/language/en-GB/en-GB.mod_custom.sys.ini
-administrator/language/en-GB/en-GB.mod_feed.ini
-administrator/language/en-GB/en-GB.mod_feed.sys.ini
-administrator/language/en-GB/en-GB.mod_latest.ini
-administrator/language/en-GB/en-GB.mod_latest.sys.ini
-administrator/language/en-GB/en-GB.mod_logged.ini
-administrator/language/en-GB/en-GB.mod_logged.sys.ini
-administrator/language/en-GB/en-GB.mod_login.ini
-administrator/language/en-GB/en-GB.mod_login.sys.ini
-administrator/language/en-GB/en-GB.mod_menu.ini
-administrator/language/en-GB/en-GB.mod_menu.sys.ini
-administrator/language/en-GB/en-GB.mod_online.ini
-administrator/language/en-GB/en-GB.mod_online.sys.ini
-administrator/language/en-GB/en-GB.mod_popular.ini
-administrator/language/en-GB/en-GB.mod_popular.sys.ini
-administrator/language/en-GB/en-GB.mod_quickicon.ini
-administrator/language/en-GB/en-GB.mod_quickicon.sys.ini
-administrator/language/en-GB/en-GB.mod_status.ini
-administrator/language/en-GB/en-GB.mod_status.sys.ini
-administrator/language/en-GB/en-GB.mod_submenu.ini
-administrator/language/en-GB/en-GB.mod_submenu.sys.ini
-administrator/language/en-GB/en-GB.mod_title.ini
-administrator/language/en-GB/en-GB.mod_title.sys.ini
-administrator/language/en-GB/en-GB.mod_toolbar.ini
-administrator/language/en-GB/en-GB.mod_toolbar.sys.ini
-administrator/language/en-GB/en-GB.mod_unread.ini
-administrator/language/en-GB/en-GB.mod_unread.sys.ini
-administrator/language/en-GB/en-GB.plg_authentication_example.ini
-administrator/language/en-GB/en-GB.plg_authentication_example.sys.ini
-administrator/language/en-GB/en-GB.plg_authentication_gmail.ini
-administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini
-administrator/language/en-GB/en-GB.plg_authentication_joomla.ini
-administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini
-administrator/language/en-GB/en-GB.plg_authentication_ldap.ini
-administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini
-administrator/language/en-GB/en-GB.plg_content_emailcloak.ini
-administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini
-administrator/language/en-GB/en-GB.plg_content_geshi.ini
-administrator/language/en-GB/en-GB.plg_content_geshi.sys.ini
-administrator/language/en-GB/en-GB.plg_content_joomla.ini
-administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini
-administrator/language/en-GB/en-GB.plg_content_loadmodule.ini
-administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini
-administrator/language/en-GB/en-GB.plg_content_pagebreak.ini
-administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini
-administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini
-administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini
-administrator/language/en-GB/en-GB.plg_content_vote.ini
-administrator/language/en-GB/en-GB.plg_content_vote.sys.ini
-administrator/language/en-GB/en-GB.plg_editors_codemirror.ini
-administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini
-administrator/language/en-GB/en-GB.plg_editors_none.ini
-administrator/language/en-GB/en-GB.plg_editors_none.sys.ini
-administrator/language/en-GB/en-GB.plg_editors_tinymce.ini
-administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini
-administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini
-administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini
-administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini
-administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini
-administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini
-administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini
-administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini
-administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini
-administrator/language/en-GB/en-GB.plg_extension_joomla.ini
-administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini
-administrator/language/en-GB/en-GB.plg_search_categories.ini
-administrator/language/en-GB/en-GB.plg_search_categories.sys.ini
-administrator/language/en-GB/en-GB.plg_search_contacts.ini
-administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini
-administrator/language/en-GB/en-GB.plg_search_content.ini
-administrator/language/en-GB/en-GB.plg_search_content.sys.ini
-administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini
-administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini
-administrator/language/en-GB/en-GB.plg_search_weblinks.ini
-administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini
-administrator/language/en-GB/en-GB.plg_system_cache.ini
-administrator/language/en-GB/en-GB.plg_system_cache.sys.ini
-administrator/language/en-GB/en-GB.plg_system_debug.ini
-administrator/language/en-GB/en-GB.plg_system_debug.sys.ini
-administrator/language/en-GB/en-GB.plg_system_languagefilter.ini
-administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini
-administrator/language/en-GB/en-GB.plg_system_log.ini
-administrator/language/en-GB/en-GB.plg_system_logout.ini
-administrator/language/en-GB/en-GB.plg_system_logout.sys.ini
-administrator/language/en-GB/en-GB.plg_system_log.sys.ini
-administrator/language/en-GB/en-GB.plg_system_p3p.ini
-administrator/language/en-GB/en-GB.plg_system_p3p.sys.ini
-administrator/language/en-GB/en-GB.plg_system_redirect.ini
-administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini
-administrator/language/en-GB/en-GB.plg_system_remember.ini
-administrator/language/en-GB/en-GB.plg_system_remember.sys.ini
-administrator/language/en-GB/en-GB.plg_system_sef.ini
-administrator/language/en-GB/en-GB.plg_system_sef.sys.ini
-administrator/language/en-GB/en-GB.plg_user_contactcreator.ini
-administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini
-administrator/language/en-GB/en-GB.plg_user_joomla.ini
-administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini
-administrator/language/en-GB/en-GB.plg_user_profile.ini
-administrator/language/en-GB/en-GB.plg_user_profile.sys.ini
-administrator/language/en-GB/en-GB.tpl_bluestork.ini
-administrator/language/en-GB/en-GB.tpl_bluestork.sys.ini
-administrator/language/en-GB/en-GB.tpl_hathor.ini
-administrator/language/en-GB/en-GB.tpl_hathor.sys.ini
-administrator/language/en-GB/en-GB.xml
-administrator/language/en-GB/index.html
-administrator/language/overrides/*
-administrator/language/index.html
-administrator/manifests/*
-administrator/modules/mod_custom/*
-administrator/modules/mod_feed/*
-administrator/modules/mod_latest/*
-administrator/modules/mod_logged/*
-administrator/modules/mod_login/*
-administrator/modules/mod_menu/*
-administrator/modules/mod_online/*
-administrator/modules/mod_popular/*
-administrator/modules/mod_quickicon/*
-administrator/modules/mod_status/*
-administrator/modules/mod_submenu/*
-administrator/modules/mod_title/*
-administrator/modules/mod_toolbar/*
-administrator/modules/mod_unread/*
-administrator/modules/index.html
-administrator/templates/bluestork/*
-administrator/templates/hathor/*
-administrator/templates/system/*
-administrator/templates/index.html
-administrator/index.php
-cache/*
-components/com_banners/*
-components/com_contact/*
-components/com_content/*
-components/com_mailto/*
-components/com_media/*
-components/com_newsfeeds/*
-components/com_search/*
-components/com_users/*
-components/com_weblinks/*
-components/com_wrapper/*
-components/index.html
-images/banners/*
-images/sampledata/*
-images/joomla*
-images/index.html
-images/powered_by.png
-includes/*
-installation/*
-language/en-GB/en-GB.com_contact.ini
-language/en-GB/en-GB.com_content.ini
-language/en-GB/en-GB.com_mailto.ini
-language/en-GB/en-GB.com_media.ini
-language/en-GB/en-GB.com_messages.ini
-language/en-GB/en-GB.com_newsfeeds.ini
-language/en-GB/en-GB.com_search.ini
-language/en-GB/en-GB.com_users.ini
-language/en-GB/en-GB.com_weblinks.ini
-language/en-GB/en-GB.com_wrapper.ini
-language/en-GB/en-GB.files_joomla.sys.ini
-language/en-GB/en-GB.ini
-language/en-GB/en-GB.lib_joomla.ini
-language/en-GB/en-GB.localise.php
-language/en-GB/en-GB.mod_articles_archive.ini
-language/en-GB/en-GB.mod_articles_archive.sys.ini
-language/en-GB/en-GB.mod_articles_categories.ini
-language/en-GB/en-GB.mod_articles_categories.sys.ini
-language/en-GB/en-GB.mod_articles_category.ini
-language/en-GB/en-GB.mod_articles_category.sys.ini
-language/en-GB/en-GB.mod_articles_latest.ini
-language/en-GB/en-GB.mod_articles_latest.sys.ini
-language/en-GB/en-GB.mod_articles_news.ini
-language/en-GB/en-GB.mod_articles_news.sys.ini
-language/en-GB/en-GB.mod_articles_popular.ini
-language/en-GB/en-GB.mod_articles_popular.sys.ini
-language/en-GB/en-GB.mod_banners.ini
-language/en-GB/en-GB.mod_banners.sys.ini
-language/en-GB/en-GB.mod_breadcrumbs.ini
-language/en-GB/en-GB.mod_breadcrumbs.sys.ini
-language/en-GB/en-GB.mod_custom.ini
-language/en-GB/en-GB.mod_custom.sys.ini
-language/en-GB/en-GB.mod_feed.ini
-language/en-GB/en-GB.mod_feed.sys.ini
-language/en-GB/en-GB.mod_footer.ini
-language/en-GB/en-GB.mod_footer.sys.ini
-language/en-GB/en-GB.mod_languages.ini
-language/en-GB/en-GB.mod_languages.sys.ini
-language/en-GB/en-GB.mod_login.ini
-language/en-GB/en-GB.mod_login.sys.ini
-language/en-GB/en-GB.mod_menu.ini
-language/en-GB/en-GB.mod_menu.sys.ini
-language/en-GB/en-GB.mod_random_image.ini
-language/en-GB/en-GB.mod_random_image.sys.ini
-language/en-GB/en-GB.mod_related_items.ini
-language/en-GB/en-GB.mod_related_items.sys.ini
-language/en-GB/en-GB.mod_search.ini
-language/en-GB/en-GB.mod_search.sys.ini
-language/en-GB/en-GB.mod_stats.ini
-language/en-GB/en-GB.mod_stats.sys.ini
-language/en-GB/en-GB.mod_syndicate.ini
-language/en-GB/en-GB.mod_syndicate.sys.ini
-language/en-GB/en-GB.mod_users_latest.ini
-language/en-GB/en-GB.mod_users_latest.sys.ini
-language/en-GB/en-GB.mod_weblinks.ini
-language/en-GB/en-GB.mod_weblinks.sys.ini
-language/en-GB/en-GB.mod_whosonline.ini
-language/en-GB/en-GB.mod_whosonline.sys.ini
-language/en-GB/en-GB.mod_wrapper.ini
-language/en-GB/en-GB.mod_wrapper.sys.ini
-language/en-GB/en-GB.tpl_atomic.ini
-language/en-GB/en-GB.tpl_atomic.sys.ini
-language/en-GB/en-GB.tpl_beez_20.ini
-language/en-GB/en-GB.tpl_beez_20.sys.ini
-language/en-GB/en-GB.tpl_beez5.ini
-language/en-GB/en-GB.tpl_beez5.sys.ini
-language/en-GB/en-GB.xml
-language/en-GB/index.html
-language/overrides/*
-language/index.html
-libraries/joomla/*
-libraries/phpmailer/*
-libraries/phputf8/*
-libraries/simplepie/*
-libraries/index.html
-libraries/loader.php
-logs/*
-media/contacts/*
-media/editors/*
-media/mailto/*
-media/media/*
-media/mod_languages/*
-media/system/*
-media/index.html
-modules/mod_articles_archive/*
-modules/mod_articles_categories/*
-modules/mod_articles_category/*
-modules/mod_articles_latest/*
-modules/mod_articles_news/*
-modules/mod_articles_popular/*
-modules/mod_banners/*
-modules/mod_breadcrumbs/*
-modules/mod_custom/*
-modules/mod_feed/*
-modules/mod_footer/*
-modules/mod_languages/*
-modules/mod_login/*
-modules/mod_menu/*
-modules/mod_random_image/*
-modules/mod_related_items/*
-modules/mod_search/*
-modules/mod_stats/*
-modules/mod_syndicate/*
-modules/mod_users_latest/*
-modules/mod_weblinks/*
-modules/mod_whosonline/*
-modules/mod_wrapper/*
-modules/index.html
-plugins/authentication/example/*
-plugins/authentication/gmail/*
-plugins/authentication/joomla/*
-plugins/authentication/ldap/*
-plugins/authentication/index.html
-plugins/content/emailcloak/*
-plugins/content/example/*
-plugins/content/geshi/*
-plugins/content/joomla/*
-plugins/content/loadmodule/*
-plugins/content/pagebreak/*
-plugins/content/pagenavigation/*
-plugins/content/vote/*
-plugins/content/index.html
-plugins/editors/codemirror/*
-plugins/editors/none/*
-plugins/editors/tinymce/*
-plugins/editors/index.html
-plugins/editors-xtd/article/*
-plugins/editors-xtd/image/*
-plugins/editors-xtd/pagebreak/*
-plugins/editors-xtd/readmore/*
-plugins/editors-xtd/index.html
-plugins/extension/example/*
-plugins/extension/joomla/*
-plugins/extension/index.html
-plugins/search/categories/*
-plugins/search/contacts/*
-plugins/search/content/*
-plugins/search/newsfeeds/*
-plugins/search/weblinks/*
-plugins/search/index.html
-plugins/system/cache/*
-plugins/system/debug/*
-plugins/system/languagefilter/*
-plugins/system/log/*
-plugins/system/logout/*
-plugins/system/p3p/*
-plugins/system/redirect/*
-plugins/system/remember/*
-plugins/system/sef/*
-plugins/system/index.html
-plugins/user/contactcreator/*
-plugins/user/example/*
-plugins/user/joomla/*
-plugins/user/profile/*
-plugins/user/index.html
-plugins/index.html
-templates/atomic/*
-templates/beez_20/*
-templates/beez5/*
-templates/system/*
-templates/index.html
-tmp/*
-configuration.php
-index.php
-joomla.xml
-*.txt
+/.gitignore
+/.htaccess
+/administrator/cache/*
+/administrator/components/com_admin/*
+/administrator/components/com_banners/*
+/administrator/components/com_cache/*
+/administrator/components/com_categories/*
+/administrator/components/com_checkin/*
+/administrator/components/com_config/*
+/administrator/components/com_contact/*
+/administrator/components/com_content/*
+/administrator/components/com_cpanel/*
+/administrator/components/com_finder/*
+/administrator/components/com_installer/*
+/administrator/components/com_languages/*
+/administrator/components/com_login/*
+/administrator/components/com_media/*
+/administrator/components/com_menus/*
+/administrator/components/com_messages/*
+/administrator/components/com_modules/*
+/administrator/components/com_newsfeeds/*
+/administrator/components/com_plugins/*
+/administrator/components/com_redirect/*
+/administrator/components/com_search/*
+/administrator/components/com_templates/*
+/administrator/components/com_users/*
+/administrator/components/com_weblinks/*
+/administrator/components/index.html
+/administrator/help/*
+/administrator/includes/*
+/administrator/language/en-GB/
+/administrator/language/en-GB/en-GB.com_admin.ini
+/administrator/language/en-GB/en-GB.com_admin.sys.ini
+/administrator/language/en-GB/en-GB.com_banners.ini
+/administrator/language/en-GB/en-GB.com_banners.sys.ini
+/administrator/language/en-GB/en-GB.com_cache.ini
+/administrator/language/en-GB/en-GB.com_cache.sys.ini
+/administrator/language/en-GB/en-GB.com_categories.ini
+/administrator/language/en-GB/en-GB.com_categories.sys.ini
+/administrator/language/en-GB/en-GB.com_checkin.ini
+/administrator/language/en-GB/en-GB.com_checkin.sys.ini
+/administrator/language/en-GB/en-GB.com_config.ini
+/administrator/language/en-GB/en-GB.com_config.sys.ini
+/administrator/language/en-GB/en-GB.com_contact.ini
+/administrator/language/en-GB/en-GB.com_contact.sys.ini
+/administrator/language/en-GB/en-GB.com_content.ini
+/administrator/language/en-GB/en-GB.com_content.sys.ini
+/administrator/language/en-GB/en-GB.com_cpanel.ini
+/administrator/language/en-GB/en-GB.com_cpanel.sys.ini
+/administrator/language/en-GB/en-GB.com_finder.ini
+/administrator/language/en-GB/en-GB.com_finder.sys.ini
+/administrator/language/en-GB/en-GB.com_installer.ini
+/administrator/language/en-GB/en-GB.com_installer.sys.ini
+/administrator/language/en-GB/en-GB.com_languages.ini
+/administrator/language/en-GB/en-GB.com_languages.sys.ini
+/administrator/language/en-GB/en-GB.com_login.ini
+/administrator/language/en-GB/en-GB.com_login.sys.ini
+/administrator/language/en-GB/en-GB.com_mailto.sys.ini
+/administrator/language/en-GB/en-GB.com_media.ini
+/administrator/language/en-GB/en-GB.com_media.sys.ini
+/administrator/language/en-GB/en-GB.com_menus.ini
+/administrator/language/en-GB/en-GB.com_menus.sys.ini
+/administrator/language/en-GB/en-GB.com_messages.ini
+/administrator/language/en-GB/en-GB.com_messages.sys.ini
+/administrator/language/en-GB/en-GB.com_modules.ini
+/administrator/language/en-GB/en-GB.com_modules.sys.ini
+/administrator/language/en-GB/en-GB.com_newsfeeds.ini
+/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini
+/administrator/language/en-GB/en-GB.com_plugins.ini
+/administrator/language/en-GB/en-GB.com_plugins.sys.ini
+/administrator/language/en-GB/en-GB.com_redirect.ini
+/administrator/language/en-GB/en-GB.com_redirect.sys.ini
+/administrator/language/en-GB/en-GB.com_search.ini
+/administrator/language/en-GB/en-GB.com_search.sys.ini
+/administrator/language/en-GB/en-GB.com_templates.ini
+/administrator/language/en-GB/en-GB.com_templates.sys.ini
+/administrator/language/en-GB/en-GB.com_users.ini
+/administrator/language/en-GB/en-GB.com_users.sys.ini
+/administrator/language/en-GB/en-GB.com_weblinks.ini
+/administrator/language/en-GB/en-GB.com_weblinks.sys.ini
+/administrator/language/en-GB/en-GB.com_wrapper.ini
+/administrator/language/en-GB/en-GB.com_wrapper.sys.ini
+/administrator/language/en-GB/en-GB.ini
+/administrator/language/en-GB/en-GB.lib_joomla.ini
+/administrator/language/en-GB/en-GB.localise.php
+/administrator/language/en-GB/en-GB.mod_custom.ini
+/administrator/language/en-GB/en-GB.mod_custom.sys.ini
+/administrator/language/en-GB/en-GB.mod_feed.ini
+/administrator/language/en-GB/en-GB.mod_feed.sys.ini
+/administrator/language/en-GB/en-GB.mod_latest.ini
+/administrator/language/en-GB/en-GB.mod_latest.sys.ini
+/administrator/language/en-GB/en-GB.mod_logged.ini
+/administrator/language/en-GB/en-GB.mod_logged.sys.ini
+/administrator/language/en-GB/en-GB.mod_login.ini
+/administrator/language/en-GB/en-GB.mod_login.sys.ini
+/administrator/language/en-GB/en-GB.mod_menu.ini
+/administrator/language/en-GB/en-GB.mod_menu.sys.ini
+/administrator/language/en-GB/en-GB.mod_multilangstatus.ini
+/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini
+/administrator/language/en-GB/en-GB.mod_online.ini
+/administrator/language/en-GB/en-GB.mod_online.sys.ini
+/administrator/language/en-GB/en-GB.mod_popular.ini
+/administrator/language/en-GB/en-GB.mod_popular.sys.ini
+/administrator/language/en-GB/en-GB.mod_quickicon.ini
+/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini
+/administrator/language/en-GB/en-GB.mod_status.ini
+/administrator/language/en-GB/en-GB.mod_status.sys.ini
+/administrator/language/en-GB/en-GB.mod_submenu.ini
+/administrator/language/en-GB/en-GB.mod_submenu.sys.ini
+/administrator/language/en-GB/en-GB.mod_title.ini
+/administrator/language/en-GB/en-GB.mod_title.sys.ini
+/administrator/language/en-GB/en-GB.mod_toolbar.ini
+/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini
+/administrator/language/en-GB/en-GB.mod_unread.ini
+/administrator/language/en-GB/en-GB.mod_unread.sys.ini
+/administrator/language/en-GB/en-GB.mod_version.ini
+/administrator/language/en-GB/en-GB.mod_version.sys.ini
+/administrator/language/en-GB/en-GB.plg_authentication_example.ini
+/administrator/language/en-GB/en-GB.plg_authentication_example.sys.ini
+/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini
+/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini
+/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini
+/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini
+/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini
+/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini
+/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini
+/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini
+/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini
+/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini
+/administrator/language/en-GB/en-GB.plg_content_geshi.ini
+/administrator/language/en-GB/en-GB.plg_content_geshi.sys.ini
+/administrator/language/en-GB/en-GB.plg_content_joomla.ini
+/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini
+/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini
+/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini
+/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini
+/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini
+/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini
+/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini
+/administrator/language/en-GB/en-GB.plg_content_vote.ini
+/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini
+/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini
+/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini
+/administrator/language/en-GB/en-GB.plg_editors_none.ini
+/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini
+/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini
+/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini
+/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini
+/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini
+/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini
+/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini
+/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini
+/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini
+/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini
+/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini
+/administrator/language/en-GB/en-GB.plg_extension_joomla.ini
+/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini
+/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini
+/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini
+/administrator/language/en-GB/en-GB.plg_search_categories.ini
+/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini
+/administrator/language/en-GB/en-GB.plg_search_contacts.ini
+/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini
+/administrator/language/en-GB/en-GB.plg_search_content.ini
+/administrator/language/en-GB/en-GB.plg_search_content.sys.ini
+/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini
+/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini
+/administrator/language/en-GB/en-GB.plg_search_weblinks.ini
+/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_cache.ini
+/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_debug.ini
+/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_highlight.ini
+/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini
+/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_log.ini
+/administrator/language/en-GB/en-GB.plg_system_logout.ini
+/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_log.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_p3p.ini
+/administrator/language/en-GB/en-GB.plg_system_p3p.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_redirect.ini
+/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_remember.ini
+/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_sef.ini
+/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini
+/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini
+/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini
+/administrator/language/en-GB/en-GB.plg_user_joomla.ini
+/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini
+/administrator/language/en-GB/en-GB.plg_user_profile.ini
+/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini
+/administrator/language/en-GB/en-GB.tpl_bluestork.ini
+/administrator/language/en-GB/en-GB.tpl_bluestork.sys.ini
+/administrator/language/en-GB/en-GB.tpl_hathor.ini
+/administrator/language/en-GB/en-GB.tpl_hathor.sys.ini
+/administrator/language/en-GB/en-GB.xml
+/administrator/language/en-GB/index.html
+/administrator/language/overrides/*
+/administrator/language/index.html
+/administrator/manifests/*
+/administrator/modules/mod_custom/*
+/administrator/modules/mod_feed/*
+/administrator/modules/mod_latest/*
+/administrator/modules/mod_logged/*
+/administrator/modules/mod_login/*
+/administrator/modules/mod_menu/*
+/administrator/modules/mod_multilangstatus/*
+/administrator/modules/mod_online/*
+/administrator/modules/mod_popular/*
+/administrator/modules/mod_quickicon/*
+/administrator/modules/mod_status/*
+/administrator/modules/mod_submenu/*
+/administrator/modules/mod_title/*
+/administrator/modules/mod_toolbar/*
+/administrator/modules/mod_unread/*
+/administrator/modules/mod_version/*
+/administrator/modules/index.html
+/administrator/templates/bluestork/*
+/administrator/templates/hathor/*
+/administrator/templates/system/*
+/administrator/templates/index.html
+/administrator/index.php
+/cache/*
+/cli/*
+/components/com_banners/*
+/components/com_contact/*
+/components/com_content/*
+/components/com_finder/*
+/components/com_mailto/*
+/components/com_media/*
+/components/com_newsfeeds/*
+/components/com_search/*
+/components/com_users/*
+/components/com_weblinks/*
+/components/com_wrapper/*
+/components/index.html
+/images/banners/*
+/images/sampledata/*
+/images/joomla*
+/images/index.html
+/images/powered_by.png
+/includes/*
+/installation/*
+/language/en-GB/en-GB.com_contact.ini
+/language/en-GB/en-GB.com_content.ini
+/language/en-GB/en-GB.com_mailto.ini
+/language/en-GB/en-GB.com_media.ini
+/language/en-GB/en-GB.com_messages.ini
+/language/en-GB/en-GB.com_newsfeeds.ini
+/language/en-GB/en-GB.com_search.ini
+/language/en-GB/en-GB.com_users.ini
+/language/en-GB/en-GB.com_weblinks.ini
+/language/en-GB/en-GB.com_wrapper.ini
+/language/en-GB/en-GB.files_joomla.sys.ini
+/language/en-GB/en-GB.ini
+/language/en-GB/en-GB.lib_joomla.ini
+/language/en-GB/en-GB.localise.php
+/language/en-GB/en-GB.mod_articles_archive.ini
+/language/en-GB/en-GB.mod_articles_archive.sys.ini
+/language/en-GB/en-GB.mod_articles_categories.ini
+/language/en-GB/en-GB.mod_articles_categories.sys.ini
+/language/en-GB/en-GB.mod_articles_category.ini
+/language/en-GB/en-GB.mod_articles_category.sys.ini
+/language/en-GB/en-GB.mod_articles_latest.ini
+/language/en-GB/en-GB.mod_articles_latest.sys.ini
+/language/en-GB/en-GB.mod_articles_news.ini
+/language/en-GB/en-GB.mod_articles_news.sys.ini
+/language/en-GB/en-GB.mod_articles_popular.ini
+/language/en-GB/en-GB.mod_articles_popular.sys.ini
+/language/en-GB/en-GB.mod_banners.ini
+/language/en-GB/en-GB.mod_banners.sys.ini
+/language/en-GB/en-GB.mod_breadcrumbs.ini
+/language/en-GB/en-GB.mod_breadcrumbs.sys.ini
+/language/en-GB/en-GB.mod_custom.ini
+/language/en-GB/en-GB.mod_custom.sys.ini
+/language/en-GB/en-GB.mod_feed.ini
+/language/en-GB/en-GB.mod_feed.sys.ini
+/language/en-GB/en-GB.mod_footer.ini
+/language/en-GB/en-GB.mod_footer.sys.ini
+/language/en-GB/en-GB.mod_languages.ini
+/language/en-GB/en-GB.mod_languages.sys.ini
+/language/en-GB/en-GB.mod_login.ini
+/language/en-GB/en-GB.mod_login.sys.ini
+/language/en-GB/en-GB.mod_menu.ini
+/language/en-GB/en-GB.mod_menu.sys.ini
+/language/en-GB/en-GB.mod_random_image.ini
+/language/en-GB/en-GB.mod_random_image.sys.ini
+/language/en-GB/en-GB.mod_related_items.ini
+/language/en-GB/en-GB.mod_related_items.sys.ini
+/language/en-GB/en-GB.mod_search.ini
+/language/en-GB/en-GB.mod_search.sys.ini
+/language/en-GB/en-GB.mod_stats.ini
+/language/en-GB/en-GB.mod_stats.sys.ini
+/language/en-GB/en-GB.mod_syndicate.ini
+/language/en-GB/en-GB.mod_syndicate.sys.ini
+/language/en-GB/en-GB.mod_users_latest.ini
+/language/en-GB/en-GB.mod_users_latest.sys.ini
+/language/en-GB/en-GB.mod_weblinks.ini
+/language/en-GB/en-GB.mod_weblinks.sys.ini
+/language/en-GB/en-GB.mod_whosonline.ini
+/language/en-GB/en-GB.mod_whosonline.sys.ini
+/language/en-GB/en-GB.mod_wrapper.ini
+/language/en-GB/en-GB.mod_wrapper.sys.ini
+/language/en-GB/en-GB.tpl_atomic.ini
+/language/en-GB/en-GB.tpl_atomic.sys.ini
+/language/en-GB/en-GB.tpl_beez_20.ini
+/language/en-GB/en-GB.tpl_beez_20.sys.ini
+/language/en-GB/en-GB.tpl_beez5.ini
+/language/en-GB/en-GB.tpl_beez5.sys.ini
+/language/en-GB/en-GB.xml
+/language/en-GB/index.html
+/language/en-GB/install.xml
+/language/overrides/*
+/language/index.html
+/libraries/cms.php
+/libraries/cms/*
+/libraries/joomla/*
+/libraries/phpmailer/*
+/libraries/phputf8/*
+/libraries/simplepie/*
+/libraries/index.html
+/libraries/import.php
+/libraries/loader.php
+/libraries/platform.php
+/logs/*
+/media/cms/*
+/media/com_finder/*
+/media/contacts/*
+/media/editors/*
+/media/mailto/*
+/media/media/*
+/media/mod_languages/*
+/media/overrider/*
+/media/plg_quickicon_extensionupdate/*
+/media/plg_quickicon_joomlaupdate/*
+/media/plg_system_highlight/*
+/media/system/*
+/media/index.html
+/modules/mod_articles_archive/*
+/modules/mod_articles_categories/*
+/modules/mod_articles_category/*
+/modules/mod_articles_latest/*
+/modules/mod_articles_news/*
+/modules/mod_articles_popular/*
+/modules/mod_banners/*
+/modules/mod_breadcrumbs/*
+/modules/mod_custom/*
+/modules/mod_feed/*
+/modules/mod_finder/*
+/modules/mod_footer/*
+/modules/mod_languages/*
+/modules/mod_login/*
+/modules/mod_menu/*
+/modules/mod_random_image/*
+/modules/mod_related_items/*
+/modules/mod_search/*
+/modules/mod_stats/*
+/modules/mod_syndicate/*
+/modules/mod_users_latest/*
+/modules/mod_weblinks/*
+/modules/mod_whosonline/*
+/modules/mod_wrapper/*
+/modules/index.html
+/plugins/authentication/example/*
+/plugins/authentication/gmail/*
+/plugins/authentication/joomla/*
+/plugins/authentication/ldap/*
+/plugins/authentication/index.html
+/plugins/captcha/recaptcha/*
+/plugins/content/emailcloak/*
+/plugins/content/example/*
+/plugins/content/finder/*
+/plugins/content/geshi/*
+/plugins/content/joomla/*
+/plugins/content/loadmodule/*
+/plugins/content/pagebreak/*
+/plugins/content/pagenavigation/*
+/plugins/content/vote/*
+/plugins/content/index.html
+/plugins/editors/codemirror/*
+/plugins/editors/none/*
+/plugins/editors/tinymce/*
+/plugins/editors/index.html
+/plugins/editors-xtd/article/*
+/plugins/editors-xtd/image/*
+/plugins/editors-xtd/pagebreak/*
+/plugins/editors-xtd/readmore/*
+/plugins/editors-xtd/index.html
+/plugins/extension/example/*
+/plugins/extension/joomla/*
+/plugins/extension/index.html
+/plugins/finder/index.html
+/plugins/finder/categories/*
+/plugins/finder/contacts/*
+/plugins/finder/content/*
+/plugins/finder/newsfeeds/*
+/plugins/finder/weblinks/*
+/plugins/quickicon/extensionupdate/*
+/plugins/quickicon/joomlaupdate/*
+/plugins/search/categories/*
+/plugins/search/contacts/*
+/plugins/search/content/*
+/plugins/search/newsfeeds/*
+/plugins/search/weblinks/*
+/plugins/search/index.html
+/plugins/system/cache/*
+/plugins/system/debug/*
+/plugins/system/highlight/*
+/plugins/system/languagecode/*
+/plugins/system/languagefilter/*
+/plugins/system/log/*
+/plugins/system/logout/*
+/plugins/system/p3p/*
+/plugins/system/redirect/*
+/plugins/system/remember/*
+/plugins/system/sef/*
+/plugins/system/index.html
+/plugins/user/contactcreator/*
+/plugins/user/example/*
+/plugins/user/joomla/*
+/plugins/user/profile/*
+/plugins/user/index.html
+/plugins/index.html
+/templates/atomic/*
+/templates/beez_20/*
+/templates/beez5/*
+/templates/system/*
+/templates/index.html
+/tmp/*
+/configuration.php
+/index.php
+/joomla.xml
+/*.txt
--- a/Magento.gitignore
+++ b/Magento.gitignore
@ -1,6 +1,7 @@
 .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/
@ -33,6 +34,7 @@ app/etc/modules/Mage_Weee.xml
 app/etc/modules/Mage_Widget.xml
 app/etc/modules/Mage_XmlConnect.xml
 app/etc/modules/Phoenix_Moneybookers.xml
+app/etc/modules/Cm_RedisSession.xml
 app/etc/config.xml
 app/etc/enterprise.xml
 app/etc/local.xml.additional
@ -77,6 +79,9 @@ lib/PEAR/
 lib/phpseclib/
 lib/Varien/
 lib/Zend/
+lib/Cm/
+lib/Credis/
+lib/Magento/
 LICENSE_AFL.txt
 LICENSE.html
 LICENSE.txt
@ -89,7 +94,7 @@ media/.htaccess
 media/import/
 media/xmlconnect/
 media/catalog/product/cache/
-
+api.php
 nbproject/
 pear
 pear/
--- a/Maven.gitignore
+++ b/Maven.gitignore
@ -1,2 +1,5 @@
 target/
- *.releaseBackup
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.next
+release.properties
--- a/Node.gitignore
+++ b/Node.gitignore
@ -1,4 +1,5 @@
 lib-cov
+lcov.info
 *.seed
 *.log
 *.csv
@ -10,5 +11,7 @@ lib-cov
 pids
 logs
 results
+build
+.grunt

 node_modules
--- a/Objective-C.gitignore
+++ b/Objective-C.gitignore
@ -17,7 +17,7 @@ profile
 *.moved-aside
 DerivedData
 *.hmap
-*.xccheckout
+*.ipa

 # CocoaPods
 Pods
--- a/PlayFramework.gitignore
+++ b/PlayFramework.gitignore
@ -15,3 +15,5 @@ test-result
 server.pid
 *.iml
 *.eml
+dist
+.cache
--- a/Python.gitignore
+++ b/Python.gitignore
@ -39,6 +39,9 @@ coverage.xml
 .project
 .pydevproject

+# Rope
+.ropeproject
+
 # Django stuff:
 *.log
 *.pot
--- a/ROS.gitignore
+++ b/ROS.gitignore
@ -0,0 +1,52 @@
+~$
+.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$
+
+# Generated by dynamic reconfigure
+\.cfgc$
+/cfg/cpp/
+/cfg/.*\.py$
+
+# Ignore generated docs
+.dox$
+.wikidoc$
+
+# eclipse stuff
+.project
+.cproject
+
+# qcreator stuff
+CMakeLists.txt.user
+
+srv/_.*\.py$
+\.pcd$
+.pyc$
+qtcreator-*
+*.user
+
+/planning/cfg
+/planning/docs
+/planning/src
+
+*~$
+
+# Emacs
+.#*
+
+# Catkin custom files
+CATKIN_IGNORE
--- a/Rails.gitignore
+++ b/Rails.gitignore
@ -13,6 +13,7 @@ capybara-*.html
 rerun.txt
 pickle-email-*.html
 config/initializers/secret_token.rb
+config/secrets.yml

 ## Environment normalisation:
 /.bundle
--- a/SCons.gitignore
+++ b/SCons.gitignore
@ -0,0 +1,2 @@
+# for projects that use SCons for building: http://http://www.scons.org/
+.sconsign.dblite
--- a/Scala.gitignore
+++ b/Scala.gitignore
@ -14,3 +14,4 @@ project/plugins/project/

 # Scala-IDE specific
 .scala_dependencies
+.worksheet
--- a/Scrivener.gitignore
+++ b/Scrivener.gitignore
@ -0,0 +1,7 @@
+/Files/binder.autosave
+/Files/binder.backup
+/Files/search.indexes
+/Files/user.lock
+/Files/Docs/docs.checksum
+/QuickLook/
+/Settings/ui.plist
--- a/SugarCRM.gitignore
+++ b/SugarCRM.gitignore
@ -1,33 +1,25 @@
 ## SugarCRM
 # Ignore custom .htaccess stuff.
 /.htaccess
-# Ignore large parts of the annoying cache directory without breaking things.
-cache/csv/*
-cache/dashlets/*
-cache/diagnostic/*
-cache/dynamic_fields/*
-cache/feeds/*
-cache/import/*
-cache/include/*
-cache/jsLanguage/*
-cache/modules/*
-!cache/modules/emails
-!cache/modules/Emails
-cache/pdf/*
-cache/smarty/cache/*
-cache/smarty/templates_c/*
-cache/themes/*
-cache/xml/*
+# Ignore the cache directory completely.
+# This will break the current behaviour. Which was often leading to
+# the misuse of the repository as backup replacement.
+# For development the cache directory can be safely ignored and
+# therefore it is ignored.
+/cache/
 # Ignore some files and directories from the custom directory.
-custom/history/*
-custom/modulebuilder/*
-custom/working/*
-custom/modules/*/Ext/
-custom/application/Ext/*
+/custom/history/
+/custom/modulebuilder/
+/custom/working/
+/custom/modules/*/Ext/
+/custom/application/Ext/
 # Custom configuration should also be ignored.
 /config.php
 /config_override.php
 # The silent upgrade scripts aren't needed.
-silentUpgrade*.php
+/silentUpgrade*.php
 # Logs files can safely be ignored.
 *.log
+# Ignore the new upload directories.
+/upload/
+/upload_backup/
--- a/VisualStudio.gitignore
+++ b/VisualStudio.gitignore
@ -16,9 +16,6 @@ bld/
 [Bb]in/
 [Oo]bj/

-# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
-!packages/*/build/
-
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
@ -97,6 +94,9 @@ _NCrunch_*
 *.mm.*
 AutoTest.Net/

+# Web workbench (sass)
+.sass-cache/
+
 # Installshield output folder
 [Ee]xpress/

@ -114,15 +114,19 @@ DocProject/Help/html
 publish/

 # Publish Web Output
-*.Publish.xml
+*.[Pp]ublish.xml
 *.azurePubxml

 # NuGet Packages Directory
 ## TODO: If you have NuGet Package Restore enabled, uncomment the next line
-#packages/
+#packages/*
 ## TODO: If the tool you use requires repositories.config, also 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)
+!packages/build/
+
 # Windows Azure Build Output
 csx/
 *.build.csdef
@ -139,9 +143,9 @@ ClientBin/
 *~
 *.dbmdl
 *.dbproj.schemaview
-*.[Pp]ublish.xml
 *.pfx
 *.publishsettings
+node_modules/

 # RIA/Silverlight projects
 Generated_Code/
--- a/WordPress.gitignore
+++ b/WordPress.gitignore
@ -10,3 +10,4 @@ sitemap.xml
 wp-content/cache/
 wp-content/backups/
 sitemap.xml.gz
+wp-config.php
--- a/Yeoman.gitignore
+++ b/Yeoman.gitignore
@ -0,0 +1,6 @@
+node_modules/
+bower_components/
+*.log
+
+build/
+dist/
--- a/stella.gitignore
+++ b/stella.gitignore
@ -0,0 +1,12 @@
+# Atari 2600 (Stella) support for multiple assemblers
+# - DASM
+# - CC65
+
+# Assembled binaries and object directories
+obj/
+a.out
+*.bin
+*.a26
+
+# Add in special Atari 7800-based binaries for good measure
+*.a78