Skip to content
  • Christian David's avatar
    Merge branch 'master' into onlinebanking-merge · c43ee391
    Christian David authored
    Main issues were the new coding style in CMakeLists.txt
    
    Conflicts:
    	CMakeLists.txt
    	kmymoney/CMakeLists.txt
    	kmymoney/models/CMakeLists.txt
    	kmymoney/mymoney/CMakeLists.txt
    	kmymoney/mymoney/mymoneyfiletest.cpp
    	kmymoney/mymoney/mymoneyfiletest.h
    	kmymoney/mymoney/mymoneypayee.cpp
    	kmymoney/mymoney/storage/CMakeLists.txt
    	kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp
    	kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp
    	kmymoney/plugins/CMakeLists.txt
    	kmymoney/plugins/kbanking/CMakeLists.txt
    	kmymoney/plugins/kbanking/dialogs/CMakeLists.txt
    	kmymoney/plugins/kbanking/views/CMakeLists.txt
    	kmymoney/plugins/kbanking/widgets/CMakeLists.txt
    	kmymoney/widgets/CMakeLists.txt
    c43ee391