commit 01fde758932dee61ab4587ceb9193ef1d9781f9b
Merge: 7db1394 6250e56
Author: Romain Forlot <rforlot(a)yahoo.com>
Date: Sun Dec 23 13:37:09 2012 +0100
Pull and Merge: Resolve conflict from f18 branch
en-US/Desktop.xml | 10 +++---
en-US/Installation.xml | 87 ++++++++++++++++++++++-------------------------
en-US/Networking.xml | 2 +-
3 files changed, 47 insertions(+), 52 deletions(-)
---
Show replies by date