projects / enc-live.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2695af4 fba3fd8)
Merge branch 'master' of vcs.fsf.org:enc
authorThiago Marinello <marinello@acm.org>
Mon, 23 Jun 2014 23:17:29 +0000 (20:17 -0300)
committerThiago Marinello <marinello@acm.org>
Mon, 23 Jun 2014 23:17:29 +0000 (20:17 -0300)
1  2 
pt-br/mac.html patch | diff1 | diff2 | blob | history
pt-br/windows.html patch | diff1 | diff2 | blob | history

diff --cc pt-br/mac.html
Simple merge
diff --cc pt-br/windows.html
Simple merge