[nanny: 8/8] Merge branch 'new-help'

From: Roberto Majadas <telemaco src gnome org>
To: commits-list gnome org
Cc:
Subject: [nanny: 8/8] Merge branch 'new-help'
Date: Sat, 5 Feb 2011 17:45:50 +0000 (UTC)

commit 46d0e7b34e8856956982658eeb56661f0c33a3e2
Merge: fc416df 150b7a3
Author: Roberto Majadas <roberto majadas openshine com>
Date:   Sat Feb 5 18:44:44 2011 +0100

    Merge branch 'new-help'

 .../nanny-web-content-filter-blacklists.png        |  Bin 56174 -> 55781 bytes
 help/C/nanny.xml                                   |  100 ++++++++++---------
 .../nanny-web-content-filter-blacklists.png        |  Bin 60436 -> 57846 bytes
 3 files changed, 53 insertions(+), 47 deletions(-)
---

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]