]> wagner.pp.ru Git - openssl-gost/engine.git/commit
Merge commit '13dcbd1' into object_db
authorVictor Wagner <wagner@atlas-kard.ru>
Thu, 1 Oct 2015 13:38:12 +0000 (16:38 +0300)
committerVictor Wagner <wagner@atlas-kard.ru>
Thu, 1 Oct 2015 13:38:12 +0000 (16:38 +0300)
commitaf2081bb52dd1b222af3f1ecb07a04b7eacd11d7
tree19898afbe0fd04ff1237add8e7c6f96a0f098039
parent0fd84c8144c5291fc3b1887204e571e731959a0b
parent13dcbd17f3c370a7005459e1b2e6470b0262d844
Merge commit '13dcbd1' into object_db

Conflicts:
Makefile