Merge branch_1_0 to HEAD, take 3.
authorFrantišek Dvořák <valtri@civ.zcu.cz>
Tue, 26 Jun 2012 10:41:24 +0000 (10:41 +0000)
committerFrantišek Dvořák <valtri@civ.zcu.cz>
Tue, 26 Jun 2012 10:41:24 +0000 (10:41 +0000)
commit7cdf0258b2fe72edced554e706b28d3a14a197b0
tree495e944edb21bf045d79dfe42889bee0a4c9852d
parent7aa79e2bf10ea8ff9809a41bc8497eaad9936400
Merge branch_1_0 to HEAD, take 3.
emi.canl.canl-c/Makefile
emi.canl.canl-c/doc/src/canl-cs-auth-connection.tex
emi.canl.canl-c/doc/src/canl.tex
emi.canl.canl-c/project/debian.canl.doc-base
emi.canl.canl-c/project/debian.libcanl-c-dev.dirs
emi.canl.canl-c/project/debian.rules