Merge branch 'master' into plasma-dashboard
author Guillaume de Bure
()
committer Guillaume de Bure
()
commit 5630ee8dc60b181d160622ed7447fdbaafe450e0
tree 6e263e66aaf7fa35e279b27d752a392ecfd39520
parent 3309a2f0d97584f02d08f671be8b697721a122ab
parent 714331d7a3575c820e7094cd51e9664e68e4b594
Merge branch 'master' into plasma-dashboard
64 files changed:
CHANGELOG
CMakeLists.txt
skg_advice/skg-plugin-advice.desktop
skg_advice/skgadviceboardwidget.cpp
skg_bookmark/skg-plugin-bookmark.desktop
skg_dashboard/skg-plugin-dashboard.desktop
skg_dashboard2/skg-plugin-dashboard2.desktop
skg_dataengine/skgdataengine.desktop
skg_debug/skg-plugin-debug.desktop
skg_delete/skg-plugin-delete.desktop
skg_file/skg-plugin-file.desktop
skg_print/skg-plugin-print.desktop
skg_properties/skg-plugin-properties.desktop
skg_selectall/skg-plugin-selectall.desktop
skg_undoredo/skg-plugin-undoredo.desktop
skgapplets/account/accountskroogoid.desktop
skgapplets/advice/adviceskroogoid.desktop
skgapplets/alarm/alarmskroogoid.desktop
skgapplets/bank/bankskroogoid.desktop
skgapplets/calculator/calculatorskroogoid.desktop
skgapplets/highlightedoperation/highlightedoperationskroogoid.desktop
skgapplets/operation/operationskroogoid.desktop
skgapplets/scheduledoperation/scheduledoperationskroogoid.desktop
skgapplets/tipsoftheday/tipsofthedayapplet.desktop
skgapplets/unit/unitskroogoid.desktop
skgbankmodeler/skgimportexportmanager.cpp
skgbankmodeler/skgimportxhb.cpp
skgbankmodeler/skgoperationobject.cpp
skgbankmodelertest/skgtestimportqif.cpp
skgbasegui/skg-plugin.desktop
skgbasegui/skgcalculatoredit.cpp
skgbasegui/skgobjectmodelbase.cpp
skgbasegui/skgtablewithgraph.cpp
skgbasegui/skgtablewithgraph.h
skgbasegui/skgtabpage.cpp
skgbasegui/skgtabpage.h
skgbasemodeler/skgerror.cpp
skgbasemodeler/skgservices.cpp
skgmyapplitest/skgmyapplitest.desktop
skgmyapplitest/skgmyapplitest.notifyrc
skrooge/skrooge.desktop
skrooge/skrooge.notifyrc
skrooge_bank/skrooge-plugin-bank.desktop
skrooge_budget/skrooge-plugin-budget.desktop
skrooge_calculator/skrooge-plugin-calculator.desktop
skrooge_categories/skgcategoriespluginwidget.cpp
skrooge_categories/skrooge-plugin-categories.desktop
skrooge_importexport/skgimportexportplugin.cpp
skrooge_importexport/skrooge-plugin-importexport.desktop
skrooge_monthly/skrooge-plugin-monthly.desktop
skrooge_operation/skgsplittabledelegate.cpp
skrooge_operation/skrooge-plugin-operation.desktop
skrooge_payee/skrooge-plugin-payee.desktop
skrooge_report/skrooge-plugin-report.desktop
skrooge_scheduled/skrooge-plugin-scheduled.desktop
skrooge_search/skgalarmboardwidget.cpp
skrooge_search/skrooge-plugin-search.desktop
skrooge_tracker/skrooge-plugin-tracker.desktop
skrooge_unit/skrooge-plugin-unit.desktop
templates/skrooge_xxx/skrooge-plugin-xxx.desktop
tests/input/skgtestimportqif/271708/10-Compte A.qif [ new file with mode 0644 ]
tests/input/skgtestimportqif/271708/20-Compte B.qif [ new file with mode 0644 ]
tests/input/skgtestimportqif/271708/30-Compte C.qif [ new file with mode 0644 ]
tests/input/skgtestimportqif/271708/40-Compte D.qif [ new file with mode 0644 ]