[nautilus-actions: 4/4] Merge branch 'schemes'



commit 7090ab17964808d538a29e9d43e4581354625986
Merge: e4d0bb0 525fd03
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Jan 20 23:36:50 2010 +0100

    Merge branch 'schemes'

 ChangeLog                                          |   14 +
 TODO                                               |   11 +-
 configure.ac                                       |    1 -
 data/nautilus-actions.schemas.in                   |   15 +-
 nautilus-actions/io-provider-gconf/nagp-read.c     |    8 +-
 nautilus-actions/nact/Makefile.am                  |    3 +
 nautilus-actions/nact/nact-iadvanced-tab.c         |  669 +-------------
 nautilus-actions/nact/nact-preferences-editor.c    |   27 +
 nautilus-actions/nact/nact-preferences.ui          |  775 ++++++++++++++++
 nautilus-actions/nact/nact-schemes-list.c          |  938 ++++++++++++++++++++
 nautilus-actions/nact/nact-schemes-list.h          |   49 +
 .../nact/nautilus-actions-config-tool.ui           |  700 +---------------
 12 files changed, 1873 insertions(+), 1337 deletions(-)
---



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