diff options
author | Jacob Thornton <jacobthornton@gmail.com> | 2012-02-01 01:18:34 +0400 |
---|---|---|
committer | Jacob Thornton <jacobthornton@gmail.com> | 2012-02-01 01:18:34 +0400 |
commit | 0bfbe5058d61ae93d82b09f1dff7eb30dc22426e (patch) | |
tree | 6ccf3dd9c36ff4b1f6cde5edbce21cdf0de78497 /.gitignore | |
parent | 43cbc9440425b7c97c943690eefd14520de708e1 (diff) | |
parent | 4bd1ba4e0dc44d1d16161306576548f378ab1f8a (diff) |
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
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 6bc915a8ee..19700fef06 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,33 @@ +# Numerous always-ignore extensions +*.diff +*.err +*.orig +*.log +*.rej +*.swo +*.swp +*.vi *~ +*.sass-cache + +# OS or Editor folders .DS_Store -thumbs.db -js/min
\ No newline at end of file +Thumbs.db +.cache +.project +.settings +.tmproj +*.esproj +nbproject +*.sublime-project +*.sublime-workspace + +# Komodo +*.komodoproject +.komodotools + +# Folders to ignore +.hg +.svn +.CVS +.idea
\ No newline at end of file |