Public Git Hosting - nginx-catap.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 510ed9a 405906c)

commit	616006b1b69f0c81d25b7f3ca1540b89b391fa5a
author	Kirill A. Korinskiy <catap@catap.ru>
	Thu, 27 Aug 2009 11:57:03 +0000 (27 15:57 +0400)
committer	Kirill A. Korinskiy <catap@catap.ru>
	Thu, 27 Aug 2009 11:57:03 +0000 (27 15:57 +0400)
tree	61adc2894145b8598cca14f82aee88ffc2f06ee7	tree \| snapshot (tar.gz zip)
parent	510ed9afeea0d26ee507661ea0b1cad31fea210c	commit \| diff
parent	405906cba25be8811ef203c3892a099d4ec5df7a	commit \| diff

Merge commit 'v0.8.10'

Conflicts:
CHANGES
CHANGES.ru
src/core/nginx.h
src/event/ngx_event.c
src/http/modules/perl/nginx.pm

CHANGES	diff1 \|	diff2 \|	blob \| history
CHANGES.ru	diff1 \|	diff2 \|	blob \| history
auto/os/linux	diff1 \|	diff2 \|	blob \| history
src/core/nginx.h	diff1 \|	diff2 \|	blob \| history
src/event/ngx_event.c	diff1 \|	diff2 \|	blob \| history
src/http/modules/perl/nginx.pm	diff1 \|	diff2 \|	blob \| history
src/http/ngx_http_upstream.c	diff1 \|	diff2 \|	blob \| history
src/os/unix/ngx_process_cycle.c	diff1 \|	diff2 \|	blob \| history

catap's nginx repository