merging branch_1_0 to HEAD. HEAD is the only branch from now.
authorMarcel Poul <marcel.poul@cern.ch>
Mon, 28 May 2012 20:01:54 +0000 (20:01 +0000)
committerMarcel Poul <marcel.poul@cern.ch>
Mon, 28 May 2012 20:01:54 +0000 (20:01 +0000)
commit9f2200e8d93daa1fa4ce0db18d0780e85e23de2e
treea7d5167e99635225a10242bca58f231789bec134
parent35cdeabfc0fe5d5353a676a71cc7dfc39a871e57
merging branch_1_0 to HEAD. HEAD is the only branch from now.
emi.canl.canl-c/project/canl-c.spec
emi.canl.canl-c/project/debian.control
emi.canl.canl-c/project/debian.libcanl-c-dev.dirs
emi.canl.canl-c/project/debian.rules