[Pkg-haskell-commits] [bustle] 02/03: Merge tag 'upstream/0.4.8'

[Joachim Breitner]

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

nomeata pushed a commit to branch master
in repository bustle.

commit 0e7cf8f3121c4b518e87c28addeb348b314e9467
Merge: 33baea5 071cb1e
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Fri May 22 09:41:23 2015 +0200

    Merge tag 'upstream/0.4.8'
    
    Upstream version 0.4.8

 Bustle/Diagram.hs                       |  26 +++++---
 Bustle/{Markup.hs => Marquee.hs}        |  52 ++++++++--------
 Bustle/StatisticsPane.hs                |  34 +++++------
 Bustle/UI.hs                            |   8 ++-
 Bustle/UI/Canvas.hs                     |   3 +-
 Bustle/UI/DetailsView.hs                |  14 ++---
 Bustle/UI/FilterDialog.hs               |   2 +-
 Bustle/UI/Recorder.hs                   |  10 +--
 HACKING => HACKING.md                   |   0
 INSTALL => INSTALL.md                   |   0
 Makefile                                |  15 ++++-
 NEWS => NEWS.md                         |  11 ++++
 README => README.md                     |   0
 Test/Regions.hs                         |  22 ++++---
 bustle.cabal                            |  17 +++---
 data/icons/scalable/bustle-symbolic.svg | 104 ++++++++++++++++++++++++++++++++
 data/icons/scalable/bustle.svg          |  25 ++------
 17 files changed, 238 insertions(+), 105 deletions(-)

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