vcs.fsf.org Git - enc-live.git/commit

projects / enc-live.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6c35fed 8fd4a69)

author	Lisa Marie Maginnis <lisam@fsf.org>
	Mon, 30 Jun 2014 02:30:35 +0000 (22:30 -0400)
committer	Lisa Marie Maginnis <lisam@fsf.org>
	Mon, 30 Jun 2014 02:30:35 +0000 (22:30 -0400)
commit	84401febbf5d59ea925a6e8710dbf17cefa2c58f
tree	0583cdddf468f49820908c10d628bf2c213ae88c	tree \| snapshot (zip tar.gz)
parent	6c35fed4c27e9d608f8b1f47d7a4ab1848bae799	commit \| diff
parent	8fd4a69a7eed6cad88443ee5253dd0f99924a7da	commit \| diff

Merge branch 'master' of vcs.fsf.org:enc

22 files changed:

en/index.html	diff1 \|	diff2 \|	blob \| history
en/mac.html	diff1 \|	diff2 \|	blob \| history
en/windows.html	diff1 \|	diff2 \|	blob \| history
fr/index.html	diff1 \|	diff2 \|	blob \| history
fr/mac.html	diff1 \|	diff2 \|	blob \| history
fr/windows.html	diff1 \|	diff2 \|	blob \| history
ja/index.html	diff1 \|	diff2 \|	blob \| history
ja/mac.html	diff1 \|	diff2 \|	blob \| history
ja/windows.html	diff1 \|	diff2 \|	blob \| history
ko/index.html	diff1 \|	diff2 \|	blob \| history
pt-br/index.html	diff1 \|	diff2 \|	blob \| history
pt-br/mac.html	diff1 \|	diff2 \|	blob \| history
pt-br/windows.html	diff1 \|	diff2 \|	blob \| history
ro/index.html	diff1 \|	diff2 \|	blob \| history
ro/mac.html	diff1 \|	diff2 \|	blob \| history
ro/windows.html	diff1 \|	diff2 \|	blob \| history
ru/index.html	diff1 \|	diff2 \|	blob \| history
ru/mac.html	diff1 \|	diff2 \|	blob \| history
ru/windows.html	diff1 \|	diff2 \|	blob \| history
tr/index.html	diff1 \|	diff2 \|	blob \| history
tr/mac.html	diff1 \|	diff2 \|	blob \| history
tr/windows.html	diff1 \|	diff2 \|	blob \| history