projects / enc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17151a7 ef31b20)
Merge branch 'master' of vcs.fsf.org:enc
authorlucastx <lucas@lucasteixeira.com>
Fri, 20 Jun 2014 22:34:20 +0000 (19:34 -0300)
committerlucastx <lucas@lucasteixeira.com>
Fri, 20 Jun 2014 22:34:20 +0000 (19:34 -0300)
Conflicts:
static


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