diff options
| author | Ralph Amissah <ralph@amissah.com> | 2015-04-25 13:50:40 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2015-04-25 13:50:40 -0400 |
| commit | aeb7754510ffacc207b17e5d7512ff5f14debcc3 (patch) | |
| tree | e2f17e3ad2ee4e1ea81287febe5049ce6fb82147 /.gitignore | |
| parent | added patch jessie_bugfix_767761 (diff) | |
| parent | version & changelog, tag for release (diff) | |
Merge tag 'sisu_5.8.0' into debian/sid
SiSU 5.8.0
Conflicts:
.gitignore
data/doc/sisu/CHANGELOG_v5
data/doc/sisu/CHANGELOG_v6
data/sisu/v5/v/version.yml
data/sisu/v6/v/version.yml
setup/sisu_version.rb
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -1,8 +1,13 @@ # git ls-files --others --exclude-from=.git/info/exclude *~ +*_ \#* -.pc +*.\#* +*.tmp +*_tmp *.gem *.gemspec -*.qi -*.qi.rb +*_.rb +*.rb_ +.pc +0???-*.patch |