Conflicts:
	Objective-C.gitignore

Added Windows Azure build output files

ignoring *.dylib (dynamic link libraries in MacOS X)

Update to also ignore .DS_Store files

the current version of Cakephp (2.x) renamed the config folder to Config

*.dylib is an extension for dynamic link library in MacOS X.

the current version of Cakephp (2.x) renamed the config folder to Config. adding core to the list of files to ignore as this contains security salts.

Global/Windows: Recycle Bins on network shares

Updated Magento.gitignore for the latest Enterprise edition.

Add Unity gitignore

C

added another path (Symfony.gitignore)

DerivedData is the "build/" Folder that *might* be in your Project's fol...

Add Textpattern gitignore

Add gitignore for sketchup backup files.

ActionScript: Added "bin" folder

Added GWT Project related paths to a new GWT.gitignore file.

lib/ and modules/

Remove node_modules from Node.gitignore

Added Xilinx ISE gitignore

Update Global/VisualStudio.gitignore

Adds modules

added content_*.php with a suggestion

VisualStudio.gitignore: Ignore the ‘x64’ directories

SASS ignore File

a more complete .gitignore for Grails 1.2 and 1.3

Bumpy case StyleCop file wasn't being ignored

Added Org-mode section to Emacs ignore file

added gitignore for Oracle Forms development

Add Delphi gitignore

Added .virthualenv directory.

Added NuGet "packages" directory and some NCrunch files to the VisualStudio.gitignore

added symphony and workspace/uploads dir