]> Some of my projects - localmylist.git/commitdiff
Merge branch 'dynamic-model' of ssh://aptx.org/var/git/localmylist into dynamic-model dynamic-model
authorAPTX <marek321@gmail.com>
Sat, 3 Aug 2013 17:07:39 +0000 (19:07 +0200)
committerAPTX <marek321@gmail.com>
Sat, 3 Aug 2013 17:07:39 +0000 (19:07 +0200)
Conflicts:
localmylist/dynamicmodel/data.cpp
localmylist/dynamicmodel/data.h
localmylist/dynamicmodel/datatype.cpp
localmylist/dynamicmodel/datatype.h
localmylist/dynamicmodel/dynamicmodel_global.h
localmylist/dynamicmodel/model.cpp
localmylist/dynamicmodel/model.h
localmylist/dynamicmodel/node.cpp
localmylist/dynamicmodel/node.h
localmylist/dynamicmodel/types.cpp
localmylist/dynamicmodel/types.h
localmylist/localmylist.pro


Trivial merge