[Pkg-mozext-commits] [all-in-one-sidebar] 42/49: Merge branch 'version/v0.7.24'

[David Prévot]

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

taffit pushed a commit to branch master
in repository all-in-one-sidebar.

commit 3cd0c3fb4149d5e297088506ac13e747f3e92db7
Merge: 0eb6c65 69e5853
Author: Ingo Wennemaring <github at addonlab.com>
Date:   Wed Sep 10 21:20:41 2014 +0200

    Merge branch 'version/v0.7.24'
    
    Conflicts:
    	install.rdf

 content/_lib.js       |  10 +-
 content/addons.xul    |   2 +-
 content/aios.xul      |  19 +--
 content/aios_fx.js    | 187 +------------------------
 install.rdf           |   8 +-
 skin/css/addons.css   | 369 +++++++++++++++++++++++++++++++++++++++++++++++++-
 skin/css/aios.css     | 265 +++++++++++++++++++++++++++++++++++-
 skin/scss/addons.scss |   8 +-
 skin/scss/aios.scss   |   2 +-
 9 files changed, 663 insertions(+), 207 deletions(-)

diff --cc install.rdf
index 69e4d95,c146893..453f299
--- a/install.rdf
+++ b/install.rdf
@@@ -27,4 -27,4 +27,4 @@@
          </em:targetApplication>
  
      </Description>
--</RDF>
++</RDF>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/all-in-one-sidebar.git