git.gag.com Git - debian/sudo/commit

projects / debian / sudo / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0cd4e21 06a67e2)

author	Bdale Garbee <bdale@gag.com>
	Sat, 28 Mar 2009 12:37:47 +0000 (06:37 -0600)
committer	Bdale Garbee <bdale@gag.com>
	Sat, 28 Mar 2009 12:37:47 +0000 (06:37 -0600)
commit	812709a155f4e8ca2a6b6070bad027a372835857
tree	987ffd9d845bb731f8eb2bf28921c6f5484f7f18	tree \| snapshot
parent	0cd4e213804686bf5ddb11ff2c86acbc467a58e5	commit \| diff
parent	06a67e2a5850f36c627b46f330c988e031536ab3	commit \| diff

Merge commit 'upstream/1.7.0'

Conflicts:
Makefile.in
parse.c
parse.yacc
sudo.h
sudoers.man.in
sudoers.pod

Makefile.in	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
env.c	diff1 \|	diff2 \|	blob \| history
sample.sudoers	diff1 \|	diff2 \|	blob \| history
sudo.c	diff1 \|	diff2 \|	blob \| history
sudo.man.in	diff1 \|	diff2 \|	blob \| history
sudo.pod	diff1 \|	diff2 \|	blob \| history
sudoers.man.in	diff1 \|	diff2 \|	blob \| history
sudoers.pod	diff1 \|	diff2 \|	blob \| history
visudo.man.in	diff1 \|	diff2 \|	blob \| history

Debian packaging of sudo