Merge branch 'master' of https://git.bukova.info/repos/git/prodejna
Conflicts: core/core.pro
This commit is contained in:
@@ -16,6 +16,7 @@ SOURCES += \
|
||||
context.cpp \
|
||||
imetadataplugin.cpp \
|
||||
transaction.cpp \
|
||||
emptystringvalidator.cpp
|
||||
data/role.cpp \
|
||||
data/permission.cpp
|
||||
|
||||
@@ -29,6 +30,8 @@ HEADERS += core.h\
|
||||
autotablemodel.h \
|
||||
autoform.h \
|
||||
transaction.h \
|
||||
ivalidator.h \
|
||||
emptystringvalidator.h
|
||||
data/role.h \
|
||||
data/permission.h
|
||||
|
||||
|
||||
Reference in New Issue
Block a user