diff options
| author | Charles Oliver Nutter <headius@headius.com> | 2015-01-09 10:06:51 -0600 |
|---|---|---|
| committer | Charles Oliver Nutter <headius@headius.com> | 2015-01-09 10:06:51 -0600 |
| commit | 3ddffabc91bee3ba136a9367f24083b6bf9fd7ef (patch) | |
| tree | e73ce4213df554530b1088bc9d082b62f46f2862 /.gitignore | |
| parent | ea50d0179c51d271c9fead299e9bf6dd06fe9689 (diff) | |
| parent | 24055a152492123b7516e9b4e54af5710ffed247 (diff) | |
| download | psych-3ddffabc91bee3ba136a9367f24083b6bf9fd7ef.tar.gz | |
Merge remote-tracking branch 'origin/master' into jruby
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -1,4 +1,6 @@ -lib/psych/psych.bundle -lib/psych/psych.jar -tmp -pkg +*.swp +*.bundle +*.jar +*.class +/pkg +/tmp |