Bootstrap/.gitignore

# Numerous always-ignore extensions
*.diff
*.err
*.orig
*.log
*.rej
*.swo
*.swp
*.vi
*~
*.sass-cache

# OS or Editor folders
.DS_Store
Thumbs.db
.cache
.project
.settings
.tmproj
*.esproj
nbproject
*.sublime-project
*.sublime-workspace

# Komodo
*.komodoproject
.komodotools

# Folders to ignore
.hg
.svn
.CVS
.idea
Add various always-ignore extensions, files, and folders to `.gitignore` 2012-01-19 20:31:45 +00:00			`# Numerous always-ignore extensions`
			`*.diff`
			`*.err`
			`*.orig`
			`*.log`
			`*.rej`
			`*.swo`
			`*.swp`
			`*.vi`
.gitignore update. 2011-10-07 06:02:02 +02:00			`*~`
Add various always-ignore extensions, files, and folders to `.gitignore` 2012-01-19 20:31:45 +00:00			`*.sass-cache`

			`# OS or Editor folders`
.gitignore update. 2011-10-07 06:02:02 +02:00			`.DS_Store`
Add various always-ignore extensions, files, and folders to `.gitignore` 2012-01-19 20:31:45 +00:00			`Thumbs.db`
			`.cache`
			`.project`
			`.settings`
			`.tmproj`
			`*.esproj`
			`nbproject`
			`*.sublime-project`
			`*.sublime-workspace`

			`# Komodo`
			`*.komodoproject`
			`.komodotools`

			`# Folders to ignore`
			`.hg`
			`.svn`
			`.CVS`
Merge branch '2.0-wip' Conflicts: .gitignore LICENSE Makefile bootstrap.css bootstrap.min.css docs/assets/js/application.js docs/assets/js/google-code-prettify/prettify.css docs/index.html docs/javascript.html examples/container-app.html examples/fluid.html examples/hero.html js/bootstrap-alerts.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tabs.js js/bootstrap-twipsy.js js/tests/index.html js/tests/unit/bootstrap-modal.js js/tests/unit/bootstrap-popover.js js/tests/unit/bootstrap-tabs.js lib/forms.less lib/mixins.less lib/patterns.less lib/scaffolding.less lib/tables.less 2012-01-31 13:18:34 -08:00			`.idea`