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

projects / debian / sudo / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9ba256f 034bfa9)

author	Bdale Garbee <bdale@gag.com>
	Sun, 6 Jul 2008 07:17:03 +0000 (01:17 -0600)
committer	Bdale Garbee <bdale@gag.com>
	Sun, 6 Jul 2008 07:17:03 +0000 (01:17 -0600)
commit	828c950bce2811aad2abba528f37d840c3acb970
tree	2f807264ef84871c67ef03fd43953ea906c7f95c	tree \| snapshot
parent	9ba256f8f5bdd3a878758980939b7e45684da746	commit \| diff
parent	034bfa94d8911bef1d553a639d43aa8cdefac765	commit \| diff

Merge commit 'upstream/1.6.9p17'

Conflicts:

sudo.cat

Makefile.in	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
debian/changelog	diff1 \|	\|	blob \| history
env.c	diff1 \|	diff2 \|	blob \| history
sudo.c	diff1 \|	diff2 \|	blob \| history
sudo.man.in	diff1 \|	diff2 \|	blob \| history
sudoers.man.in	diff1 \|	diff2 \|	blob \| history
visudo.man.in	diff1 \|	diff2 \|	blob \| history

Debian packaging of sudo