www.vanbest.org Git - sasc-ng.git/commit

]> www.vanbest.org Git - sasc-ng.git/commit

projects / sasc-ng.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7e30044 c06f657)

author	mirv <unknown>
	Sat, 5 Jan 2008 18:03:42 +0000 (19:03 +0100)
committer	mirv <unknown>
	Sat, 5 Jan 2008 18:03:42 +0000 (19:03 +0100)
commit	d659eca3a4b49317f1d524c9162c4c6b5443b8b1
tree	e432f3195d6150c86db97f45a8410d47ae6883e4	tree \| snapshot
parent	7e30044be4f5fc4c6fc7ec7a016a61a3d289feff	commit \| diff
parent	c06f657fcf142bd2ddb13795762bb9629857c025	commit \| diff

merge stable changes

cam.c	diff1 \|	diff2 \|	blob \| history
sc.c	diff1 \|	diff2 \|	blob \| history
smartcard.c	diff1 \|	diff2 \|	blob \| history
systems/viaccess/tps.c	diff1 \|	diff2 \|	blob \| history
systems/viaccess/viaccess.c	diff1 \|	diff2 \|	blob \| history
testing/compat.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.