[Pkg-privacy-commits] [nautilus-wipe] 183/224: Merge remote-tracking branch 'upstream_origin/master' into upstream

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

u-guest pushed a commit to branch master
in repository nautilus-wipe.

commit 8eda46e9b6a0bbecf848d68937f1030718d8f79d
Merge: a1fdc23 24433cb
Author: intrigeri <intrigeri at boum.org>
Date:   Thu May 16 14:26:19 2013 +0200

    Merge remote-tracking branch 'upstream_origin/master' into upstream
    
    Conflicts:
    	NEWS
    	configure.ac
    	nautilus-wipe/fill-operation.c
    	nautilus-wipe/nautilus-wipe.c
    	nautilus-wipe/nw-operation-manager.c

 NEWS                                               |   2 +-
 README                                             |  29 +-
 configure.ac                                       |  21 +-
 nautilus-wipe/Makefile.am                          |  40 +-
 nautilus-wipe/delete-operation.c                   | 112 ----
 nautilus-wipe/delete-operation.h                   |  63 ---
 nautilus-wipe/extension.c                          |  59 +++
 nautilus-wipe/fill-operation.c                     | 418 ---------------
 nautilus-wipe/fill-operation.h                     |  71 ---
 nautilus-wipe/nautilus-wipe.c                      | 582 ---------------------
 nautilus-wipe/nautilus-wipe.h                      |  75 ---
 nautilus-wipe/{compat.h => nw-compat.h}            |  15 +-
 nautilus-wipe/nw-delete-operation.c                |  70 +++
 nautilus-wipe/nw-delete-operation.h                |  59 +++
 nautilus-wipe/nw-extension.c                       | 354 +++++++++++++
 nautilus-wipe/nw-extension.h                       |  63 +++
 nautilus-wipe/nw-fill-operation.c                  | 406 ++++++++++++++
 nautilus-wipe/nw-fill-operation.h                  |  88 ++++
 ...{operation-manager.c => nw-operation-manager.c} | 113 ++--
 nautilus-wipe/nw-operation-manager.h               |  49 ++
 nautilus-wipe/nw-operation.c                       |  69 +++
 nautilus-wipe/nw-operation.h                       |  59 +++
 nautilus-wipe/nw-path-list.c                       | 155 ++++++
 nautilus-wipe/nw-path-list.h                       |  40 ++
 .../{progress-dialog.c => nw-progress-dialog.c}    | 292 +++++------
 nautilus-wipe/nw-progress-dialog.h                 |  96 ++++
 nautilus-wipe/nw-type-utils.h                      | 110 ++++
 nautilus-wipe/operation-manager.h                  |  73 ---
 nautilus-wipe/progress-dialog.h                    |  96 ----
 nautilus-wipe/test.c                               |  84 ---
 po/LINGUAS                                         |   2 +
 po/POTFILES.in                                     |   8 +-
 po/de.po                                           | 235 +++++++++
 po/fr.po                                           | 130 +++--
 po/ru.po                                           | 232 ++++++++
 35 files changed, 2484 insertions(+), 1886 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/nautilus-wipe.git