diff options
| author | Manoj Srivastava <srivasta@debian.org> | 2016-01-22 13:36:58 -0800 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@debian.org> | 2016-01-22 13:36:58 -0800 |
| commit | 426e91fa66c2a2341d46f977ee351bd24ef3331c (patch) | |
| tree | b4d506125335b5e5d748ac284b7239e10df96d21 /doc/.gitignore | |
| parent | 26bb2525c89ecda0b0bc7b597ec8d1b792fc8662 (diff) | |
| parent | 83d5d1695a2ab1d69ea4d8e7df27146c644876fc (diff) | |
Merge tag 'v2.6.0' into upstream
flex v2.6.0 release
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
# gpg: Signature made Sat 05 Dec 2015 11:42:31 AM PST using RSA key ID 4F8BC9A4
# gpg: requesting key 4F8BC9A4 from hkp server pool.sks-keyservers.net
# gpg: no valid OpenPGP data found.
# gpg: Total number processed: 0
# gpg: keyserver communications error: key not found
# gpg: keyserver communications error: bad public key
# gpg: Can't check signature: public key not found
# Conflicts:
# Makefile.am
# NEWS
# autogen.sh
# configure.ac
# doc/Makefile.am
# doc/flex.texi
# examples/fastwc/mywc.c
# lib/Makefile.am
# lib/malloc.c
# lib/realloc.c
# po/POTFILES.in
# po/ca.po
# po/da.po
# po/de.po
# po/eo.po
# po/es.po
# po/fi.po
# po/fr.po
# po/ga.po
# po/hr.po
# po/ko.po
# po/nl.po
# po/pl.po
# po/pt_BR.po
# po/ro.po
# po/ru.po
# po/sr.po
# po/sv.po
# po/tr.po
# po/vi.po
# po/zh_CN.po
# po/zh_TW.po
# tests/Makefile.am
# tests/README
Diffstat (limited to 'doc/.gitignore')
| -rw-r--r-- | doc/.gitignore | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 0000000..83b0108 --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1,27 @@ +flex.aux +flex.cp +flex.cps +flex.dvi +flex.fn +flex.fns +flex.hk +flex.hks +flex.info* +flex.ky +flex.log +flex.op +flex.ops +flex.pg +flex.toc +flex.tp +flex.tps +flex.vr +flex.vrs +Makefile +Makefile.in +flex.1 +flex.pdf +flex.ps +version.texi +flex.html +flex.t2p |