Merge lp://staging/~mh21/ubuntu/utopic/indicator-multiload/version-0.4 into lp://staging/ubuntu/utopic/indicator-multiload

Proposed by Michael Hofmann
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp://staging/~mh21/ubuntu/utopic/indicator-multiload/version-0.4
Merge into: lp://staging/ubuntu/utopic/indicator-multiload
Diff against target: 108382 lines (+48259/-31328)
181 files modified
HACKING (+1/-1)
Makefile.am (+150/-29)
Makefile.in (+840/-215)
README (+1/-1)
TODO (+10/-9)
aclocal.m4 (+420/-2596)
compile (+347/-0)
config.h.in (+0/-22)
configure (+491/-2841)
configure.ac (+18/-10)
data/Makefile.am (+0/-23)
data/Makefile.in (+0/-476)
data/de.mh21.indicator-multiload.gschema.xml.in.in (+801/-0)
data/de.mh21.indicator.multiload.gschema.xml.in.in (+0/-848)
data/indicator-multiload.desktop.in (+0/-1)
data/preferences.ui.in (+1696/-1216)
debian/changelog (+14/-0)
debian/compat (+1/-1)
debian/control (+2/-2)
debian/copyright (+2/-2)
depcomp (+296/-193)
indicator_multiload_vala.stamp (+1/-0)
install-sh (+7/-7)
missing (+159/-275)
po/POTFILES.in (+2/-2)
po/POTFILES.skip (+8/-2)
po/af.po (+278/-143)
po/am.po (+251/-128)
po/ar.po (+367/-176)
po/as.po (+321/-153)
po/ast.po (+333/-161)
po/az.po (+305/-158)
po/be.po (+327/-165)
po/bg.po (+360/-185)
po/bn.po (+344/-172)
po/br.po (+297/-144)
po/bs.po (+306/-159)
po/ca.po (+332/-160)
po/ca@valencia.po (+328/-160)
po/crh.po (+347/-179)
po/cs.po (+343/-161)
po/cy.po (+319/-160)
po/da.po (+346/-164)
po/de.po (+363/-185)
po/dz.po (+324/-167)
po/el.po (+330/-161)
po/en_CA.po (+319/-160)
po/en_GB.po (+333/-161)
po/eo.po (+329/-161)
po/es.po (+351/-173)
po/et.po (+329/-161)
po/eu.po (+329/-161)
po/fa.po (+322/-163)
po/fi.po (+334/-163)
po/fo.po (+234/-120)
po/fr.po (+345/-165)
po/ga.po (+329/-161)
po/gl.po (+332/-164)
po/gu.po (+331/-163)
po/he.po (+329/-161)
po/hi.po (+331/-163)
po/hr.po (+349/-166)
po/hu.po (+334/-161)
po/hy.po (+319/-151)
po/id.po (+329/-161)
po/is.po (+327/-161)
po/it.po (+343/-161)
po/ja.po (+372/-189)
po/ka.po (+320/-161)
po/kk.po (+244/-127)
po/kn.po (+329/-161)
po/ko.po (+339/-165)
po/ku.po (+322/-163)
po/ky.po (+211/-116)
po/lt.po (+353/-163)
po/lv.po (+329/-161)
po/mai.po (+322/-163)
po/mg.po (+319/-160)
po/mk.po (+319/-160)
po/ml.po (+332/-164)
po/mn.po (+292/-145)
po/mr.po (+333/-166)
po/ms.po (+343/-161)
po/nb.po (+328/-160)
po/ne.po (+314/-155)
po/nl.po (+344/-168)
po/nn.po (+329/-161)
po/oc.po (+329/-161)
po/or.po (+331/-163)
po/pa.po (+329/-162)
po/pl.po (+342/-161)
po/ps.po (+288/-147)
po/pt.po (+329/-161)
po/pt_BR.po (+333/-161)
po/ro.po (+328/-160)
po/ru.po (+355/-166)
po/rw.po (+230/-124)
po/si.po (+274/-142)
po/sk.po (+343/-161)
po/sl.po (+336/-163)
po/sq.po (+319/-160)
po/sr.po (+339/-161)
po/sr@latin.po (+330/-162)
po/sv.po (+329/-161)
po/ta.po (+334/-167)
po/te.po (+331/-163)
po/th.po (+331/-163)
po/tr.po (+329/-161)
po/ug.po (+329/-161)
po/uk.po (+348/-166)
po/vi.po (+328/-160)
po/wa.po (+264/-135)
po/xh.po (+320/-161)
po/zh_CN.po (+360/-166)
po/zh_HK.po (+328/-160)
po/zh_TW.po (+328/-160)
src/Makefile.am (+0/-58)
src/Makefile.in (+0/-752)
src/advpreferences.c (+846/-0)
src/advpreferences.vala (+182/-0)
src/appindicatorview.c (+275/-0)
src/appindicatorview.vala (+56/-0)
src/colormapper.c (+1065/-0)
src/colormapper.vala (+149/-0)
src/cpufreqprovider.c (+607/-0)
src/cpufreqprovider.vala (+81/-0)
src/cpuprovider.c (+522/-232)
src/cpuprovider.vala (+43/-18)
src/diskprovider.c (+154/-154)
src/diskprovider.vala (+5/-5)
src/expressionparser.c (+501/-501)
src/expressionparser.vala (+4/-3)
src/function.c (+204/-86)
src/function.vala (+16/-1)
src/graphmodel.c (+286/-367)
src/graphmodel.vala (+3/-13)
src/graphmodels.c (+36/-36)
src/graphmodels.vala (+1/-1)
src/gsettings-fixed.vapi (+0/-75)
src/indicator.c (+2050/-0)
src/indicator.vala (+257/-0)
src/indicator_multiload_vala.stamp (+0/-1)
src/indicatorview.c (+124/-0)
src/indicatorview.vala (+26/-0)
src/itemhelp.c (+716/-0)
src/itemhelp.vala (+126/-0)
src/itempreferences.c (+429/-408)
src/itempreferences.vala (+43/-35)
src/loadprovider.c (+83/-41)
src/loadprovider.vala (+5/-3)
src/main.c (+997/-965)
src/main.vala (+74/-56)
src/memprovider.c (+66/-66)
src/memprovider.vala (+2/-2)
src/menumodel.c (+59/-59)
src/menumodel.vala (+1/-1)
src/multiloadindicator.c (+0/-2006)
src/multiloadindicator.vala (+0/-268)
src/netprovider.c (+734/-341)
src/netprovider.vala (+51/-23)
src/preferences.c (+801/-334)
src/preferences.vala (+151/-55)
src/provider.c (+77/-45)
src/provider.vala (+4/-3)
src/providers.c (+184/-152)
src/providers.vala (+7/-6)
src/reaper.c (+59/-59)
src/reaper.vala (+1/-1)
src/settingscache.c (+52/-52)
src/settingscache.vala (+17/-18)
src/settingsconversion.c (+526/-445)
src/settingsconversion.vala (+58/-59)
src/swapprovider.c (+29/-29)
src/swapprovider.vala (+2/-2)
src/tracemodel.c (+116/-116)
src/tracemodel.vala (+2/-2)
src/trayindicatorview.c (+432/-0)
src/trayindicatorview.vala (+73/-0)
src/utils.c (+277/-208)
src/utils.vala (+37/-20)
src/various.vapi (+21/-3)
To merge this branch: bzr merge lp://staging/~mh21/ubuntu/utopic/indicator-multiload/version-0.4
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+223158@code.staging.launchpad.net

Description of the change

updated upstream version to 0.4

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Danke! Uploaded.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches