[tor-commits] [vidalia/master] Merge branch 'bug2105_breakpad'

[chiiph at torproject.org]

commit 7b01d6c9a1e6bf0349a0211b9e9e3234e1ff9c86
Merge: c0da3c8 32e4b2e
Author: Tomas Touceda <chiiph at gentoo.org>
Date:   Thu May 5 15:45:24 2011 -0300

    Merge branch 'bug2105_breakpad'
    
    Conflicts:
    	src/crashreporter/CrashReportUploader.cpp
    	src/crashreporter/CrashReportUploader.h
    	src/crashreporter/UploadProgressDialog.cpp
    	src/crashreporter/UploadProgressDialog.h

 cmake/FindBreakpad.cmake                   |    3 -
 src/crashreporter/CMakeLists.txt           |    6 +-
 src/crashreporter/CrashReportDialog.cpp    |   61 +-----------
 src/crashreporter/CrashReportDialog.h      |   28 +----
 src/crashreporter/CrashReportDialog.ui     |  115 +++++++++++++---------
 src/crashreporter/CrashReportUploader.cpp  |  152 ----------------------------
 src/crashreporter/CrashReportUploader.h    |  109 --------------------
 src/crashreporter/UploadProgressDialog.cpp |   60 -----------
 src/crashreporter/UploadProgressDialog.h   |   62 -----------
 src/crashreporter/UploadProgressDialog.ui  |  106 -------------------
 src/crashreporter/main.cpp                 |   43 +-------
 src/vidalia/CMakeLists.txt                 |    2 +-
 src/vidalia/CrashReporter.cpp              |   39 ++++++-
 src/vidalia/main.cpp                       |    2 +
 14 files changed, 118 insertions(+), 670 deletions(-)