Pileus Git - ~andy/fetchmail/commit - rcfile_l.l

]> Pileus Git - ~andy/fetchmail/commit - rcfile_l.l

projects / ~andy / fetchmail / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1a794b3 da76237)

author	Matthias Andree <matthias.andree@gmx.de>
	Tue, 17 May 2011 21:02:54 +0000 (23:02 +0200)
committer	Matthias Andree <matthias.andree@gmx.de>
	Tue, 17 May 2011 21:02:54 +0000 (23:02 +0200)
commit	aa404982fe7cb8339247fc104e99b05dbca47204
tree	6275b4f1f0a31a44758ecd779916e4e5d3487035	tree \| snapshot
parent	1a794b3b00bd4b2f720f3426a386d5c86cc65ea8	commit \| diff
parent	da76237f34afb52f35401545d7b88b99ef3f1d8b	commit \| diff

Merge 'next' branch up to tag 'before-cpp'

Conflicts:
.gitignore
configure.ac
driver.c
fetchmail.h
imap.c
kerberos.c
socket.c
transact.c

16 files changed:

.gitignore	diff1 \|	diff2 \|	blob \| history
Makefile.am	diff1 \|	diff2 \|	blob \| history
NEWS	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
driver.c	diff1 \|	diff2 \|	blob \| history
fetchmail-FAQ.html	diff1 \|	diff2 \|	blob \| history
fetchmail.h	diff1 \|	diff2 \|	blob \| history
fetchmail.man	diff1 \|	diff2 \|	blob \| history
imap.c	diff1 \|	diff2 \|	blob \| history
opie.c	diff1 \|	diff2 \|	blob \| history
options.c	diff1 \|	diff2 \|	blob \| history
sink.c	diff1 \|	diff2 \|	blob \| history
smtp.c	diff1 \|	diff2 \|	blob \| history
socket.c	diff1 \|	diff2 \|	blob \| history
socket.h	diff1 \|	diff2 \|	blob \| history
transact.c	diff1 \|	diff2 \|	blob \| history

Andy's fetchmail repository