projects
/
platform
/
upstream
/
cryptsetup.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
44c9b2f
624157e
)
Merge branch 'reenc' of https://code.google.com/p/cryptsetup into reenc
author
Milan Broz
<gmazyland@gmail.com>
Tue, 12 Jun 2012 11:26:09 +0000
(13:26 +0200)
committer
Milan Broz
<gmazyland@gmail.com>
Tue, 12 Jun 2012 11:26:09 +0000
(13:26 +0200)
Conflicts:
src/Makefile.am
Trivial merge
projects / platform / upstream / cryptsetup.git / commitdiff