[Pkg-owncloud-commits] [owncloud-client] 94/332: Merge pull request #1717 from dark-eye/master

[Sandro Knauß]

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

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit afea881d90c551a2e2a4c0209c97fea820781921
Merge: 194bba2 1921d1a
Author: dark-eye <etherpulse at gmail.com>
Date:   Tue Jun 17 08:16:52 2014 +0300

    Merge pull request #1717 from dark-eye/master
    
    Issue-142 : added time estimation and bandwidth indicator to the systray

 src/mirall/accountsettings.cpp   | 14 +++++--
 src/mirall/folderstatusmodel.cpp |  4 +-
 src/mirall/owncloudgui.cpp       | 19 ++++++---
 src/mirall/owncloudgui.h         |  1 +
 src/mirall/progressdispatcher.h  | 89 +++++++++++++++++++++++++++++++++++++---
 src/mirall/utility.cpp           | 50 ++++++++++++++++++++++
 src/mirall/utility.h             | 10 +++++
 7 files changed, 170 insertions(+), 17 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git