Permalink
Browse files

Merge remote-tracking branch 'github/master'

  • Loading branch information...
2 parents c991bc5 + 0e80099 commit 03bd37171275091ddfa04c03528dfad3498fb91d Sébastien Douche committed Apr 5, 2011
View
@@ -1,4 +1,3 @@
-
# http://www.gnu.org/software/automake
Makefile.in
View
@@ -1,8 +1,12 @@
-# compiled object files
+# Compiled Object files
+*.slo
+*.lo
*.o
-# compiled dynamic libraries
+# Compiled Dynamic libraries
*.so
-# compiled static libraries
+# Compiled Static libraries
+*.lai
+*.la
*.a
View
@@ -0,0 +1,12 @@
+# unpacked plugin folders
+plugins/**/*
+
+# files directory where uploads go
+files
+
+# DBMigrate plugin: generated SQL
+db/sql
+
+# AssetBundler plugin: generated bundles
+javascripts/bundles
+stylesheets/bundles
View
@@ -5,3 +5,12 @@ _ReSharper*
bin
obj
+# user settings
+*.user
+*.suo
+
+# if you have pictures, windows will likely create those annoying index files
+Thumbs.db
+
+# mstest test results
+TestResults
View
@@ -2,4 +2,4 @@ tmp/*
config/database.php
app/tmp/*
app/config/database.php
-
+!empty
@@ -1,4 +1,4 @@
*/config/database.php
*/system/logs/log-*.php
*/system/cache/*
-*/systen/cache/!index.html
+*/system/cache/!index.html
View
@@ -0,0 +1,4 @@
+*.vo
+*.glob
+*.v.d
+
View
@@ -0,0 +1,32 @@
+sites/default/files
+sites/default/private
+sites/default/settings.php
+cache/
+files/
+/README.txt
+/CHANGELOG.txt
+/COPYRIGHT.txt
+/INSTALL*.txt
+/LICENSE.txt
+/MAINTAINERS.txt
+/UPGRADE.txt
+robots.txt
+sites/all/README.txt
+sites/all/modules/README.txt
+sites/all/themes/README.txt
+.htaccess
+
+#for non core developer
+#only include "sites" folder without exclusions before
+cron.php
+index.php
+install.php
+update.php
+xmlrpc.php
+/includes
+/misc
+/modules
+/profiles
+/scripts
+/themes
+
@@ -0,0 +1,15 @@
+.DS_Store
+
+# Images
+images/avatars/
+images/captchas/
+images/smileys/
+images/member_photos/
+images/signature_attachments/
+images/pm_attachments/
+
+# Caches
+sized/
+thumbs/
+_thumbs/
+*/expressionengine/cache/*
@@ -1,5 +1,5 @@
-# it's better to unpack these files and commit the raw source
-# git has its own built in compression methods
+# It's better to unpack these files and commit the raw source because
+# git has its own built in compression methods.
*.7z
*.dmg
*.gz
@@ -9,4 +9,4 @@
*.tar
*.tar.gz
*.zip
-*.bzip
+*.bzip
@@ -0,0 +1,4 @@
+/CVS/*
+*/CVS/*
+.cvsignore
+*/.cvsignore
@@ -2,3 +2,6 @@
\#*\#
/.emacs.desktop
/.emacs.desktop.lock
+.elc
+auto-save-list
+tramp
@@ -1,6 +1,7 @@
.*
+!.gitignore
*~
*.sw[a-p]
-#KDE
+# KDE
.directory
@@ -0,0 +1,3 @@
+/.hg/*
+*/.hg/*
+.hgignore
@@ -1,9 +1,9 @@
-.DS_Store?
+.DS_Store
Icon?
# Thumbnails
._*
-# ack & vim swap files
-.ackrc
-*.swp
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
@@ -0,0 +1 @@
+.svn/
@@ -0,0 +1,3 @@
+# Ignore tags created by etags and ctags
+TAGS
+tags
@@ -1,2 +1,3 @@
*.tmproj
+*.tmproject
tmtags
@@ -6,25 +6,61 @@
*.user
# Build results
-Debug/
-Release/
-*.ncb
-*.aps
+[Dd]ebug/
+[Rr]elease/
+*_i.c
+*_p.c
+*.ilk
+*.meta
*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.vspscc
.builds
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+
+# Visual Studio profiler
+*.psess
+*.vsp
+
# ReSharper is a .NET coding add-in
_ReSharper*
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish
+
# Others
-bin
-Bin
-obj
-Obj
+[Bb]in
+[Oo]bj
sql
TestResults
*.Cache
ClientBin
stylecop.*
~$*
*.dbmdl
+Generated_Code #added for RIA/Silverlight projects
@@ -1,5 +1,5 @@
-#Windows images caches
+# Windows image file caches
Thumbs.db
-#Folder config file
-Desktop.ini
+# Folder config file
+Desktop.ini
@@ -1 +1,3 @@
.*.sw[a-z]
+*.un~
+Session.vim
View
@@ -0,0 +1,5 @@
+dist
+*.o
+*.hi
+*.chi
+*.chs.h
View
@@ -0,0 +1,15 @@
+jboss/server/all/deploy/project.ext
+jboss/server/default/deploy/project.ext
+jboss/server/minimal/deploy/project.ext
+jboss/server/all/log/*.log
+jboss/server/all/tmp/**/*
+jboss/server/all/data/**/*
+jboss/server/all/work/**/*
+jboss/server/default/log/*.log
+jboss/server/default/tmp/**/*
+jboss/server/default/data/**/*
+jboss/server/default/work/**/*
+jboss/server/minimal/log/*.log
+jboss/server/minimal/tmp/**/*
+jboss/server/minimal/data/**/*
+jboss/server/minimal/work/**/*
View
@@ -1,17 +1,23 @@
*.aux
*.bbl
*.blg
+*.dvi
*.glg
*.glo
*.gls
*.idx
*.ilg
*.ind
*.ist
+*.lof
*.log
+*.lot
+*.nlo
*.out
*.toc
*.fdb_latexmk
*.pdfsync
*.synctex.gz
-
+*.nav
+*.snm
+*.vrb
View
@@ -0,0 +1,20 @@
+boot.php
+index.php
+install.php
+/config/*
+!/config/config.php
+/controllers/*
+/init/*
+/logs/*
+/phproad/*
+/temp/*
+/uploaded/*
+/installer_files/*
+/modules/backend/*
+/modules/blog/*
+/modules/cms/*
+/modules/core/*
+/modules/session/*
+/modules/shop/*
+/modules/system/*
+/modules/users/*
View
@@ -0,0 +1,6 @@
+*.pdf
+*.ps
+*.midi
+*.mid
+*.log
+*~
View
@@ -0,0 +1,9 @@
+*.annot
+*.cmo
+*.cma
+*.cmi
+*.a
+*.o
+*.cmx
+*.cmxs
+*.cmxa
@@ -1,4 +1,4 @@
-# xcode
+# Xcode
build/*
*.pbxuser
!default.pbxuser
@@ -0,0 +1,15 @@
+# Extracted from https://github.com/ulrich/macaron-factory/blob/master/.gitignore
+# Ignore all dotfiles...
+.*
+# except for .gitignore
+!.gitignore
+
+# Ignore Play! working directory #
+db
+eclipse
+log
+logs
+tmp
+test-result
+eclipse
+server.pid
View
@@ -0,0 +1,5 @@
+cache
+cache-downloads
+inspector
+api
+source/inspector.html
View
@@ -12,3 +12,6 @@ capybara-*.html
/coverage/
/spec/tmp/*
**.orig
+config/*.yml
+rerun.txt
+pickle-email-*.html
Oops, something went wrong. Retry.

0 comments on commit 03bd371

Please sign in to comment.