From: APTX <marek321@gmail.com>
Date: Sat, 3 Aug 2013 17:07:39 +0000 (+0200)
Subject: Merge branch 'dynamic-model' of ssh://aptx.org/var/git/localmylist into dynamic-model
X-Git-Url: https://gitweb.aptx.org/?a=commitdiff_plain;h=b12e9fb83c3a6512d8ad08563b506ae0e8c7e806;p=localmylist.git

Merge branch 'dynamic-model' of ssh://aptx.org/var/git/localmylist into dynamic-model

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
---

b12e9fb83c3a6512d8ad08563b506ae0e8c7e806