← Back to branch summary

~neon/okteta/master

~neon/okteta/master

Viewing all changes in revision 3278.

Committer: Friedrich W. H. Kossebau
Date: 2018-08-31 13:51:27 UTC
mfrom: (3259.1.20)
Revision ID: git-v1:6c214dfb5b76451d0fc1b38dcd448e9005e1d5b9

Merge branch '0.25'

files modified:
core/bytearraymodel_p.cpp

core/codecs/textcharcodec.cpp

core/filebytearraymodel.cpp

core/filebytearraymodel_p.cpp

core/fixedsizebytearraymodel.cpp

core/tests/valuecodectest.cpp

gui/offsetformat.cpp

kasten/controllers/test/basicdatainformationtest.cpp

kasten/controllers/test/scriptclassestest.cpp

kasten/controllers/view/bytetable/bytetablemodel.cpp

kasten/controllers/view/libbytearrayfilter/filter/rotatebytearrayfilter.cpp

kasten/controllers/view/libbytearrayfilter/filter/shiftbytearrayfilter.cpp

kasten/controllers/view/structures/datatypes/array/complexarraydata.cpp

kasten/controllers/view/structures/datatypes/datainformationwithchildren.cpp

kasten/controllers/view/structures/datatypes/structuredatainformation.cpp

kasten/controllers/view/structures/datatypes/taggeduniondatainformation.cpp

kasten/controllers/view/structures/datatypes/uniondatainformation.cpp

kasten/controllers/view/structures/parsers/datainformationfactory.cpp

kasten/controllers/view/structures/parsers/osdparser.cpp

kasten/controllers/view/structures/script/classes/defaultscriptclass.cpp

kasten/controllers/view/structures/script/safereference.cpp

kasten/controllers/view/structures/script/scriptlogger.cpp

kasten/controllers/view/structures/script/scriptloggerview.cpp

kasten/controllers/view/structures/structuredefinitionfile.cpp

kasten/controllers/view/structures/structurestool.cpp

kasten/gui/io/generator/randomdata/bytearrayrandomdatagenerator.cpp

libs/kasten/controllers/documentsystem/filesystembrowser/filesystembrowserview.cpp

libs/kasten/controllers/io/copyas/copyascontroller.cpp

libs/kasten/controllers/io/export/exportcontroller.cpp

program/program.cpp

Show diffs side-by-side

added added

removed removed

core/bytearraymodel_p.cpp

core/codecs/textcharcodec.cpp

core/filebytearraymodel.cpp

core/filebytearraymodel_p.cpp

core/fixedsizebytearraymodel.cpp

core/tests/valuecodectest.cpp

gui/offsetformat.cpp

kasten/controllers/test/basicdatainformationtest.cpp

kasten/controllers/test/scriptclassestest.cpp

kasten/controllers/view/bytetable/bytetablemodel.cpp

kasten/controllers/view/libbytearrayfilter/filter/rotatebytearrayfilter.cpp

kasten/controllers/view/libbytearrayfilter/filter/shiftbytearrayfilter.cpp

kasten/controllers/view/structures/datatypes/array/complexarraydata.cpp

kasten/controllers/view/structures/datatypes/datainformationwithchildren.cpp

kasten/controllers/view/structures/datatypes/structuredatainformation.cpp

kasten/controllers/view/structures/datatypes/taggeduniondatainformation.cpp

kasten/controllers/view/structures/datatypes/uniondatainformation.cpp

kasten/controllers/view/structures/parsers/datainformationfactory.cpp

kasten/controllers/view/structures/parsers/osdparser.cpp

kasten/controllers/view/structures/script/classes/defaultscriptclass.cpp

kasten/controllers/view/structures/script/safereference.cpp

kasten/controllers/view/structures/script/scriptlogger.cpp

kasten/controllers/view/structures/script/scriptloggerview.cpp

kasten/controllers/view/structures/structuredefinitionfile.cpp

kasten/controllers/view/structures/structurestool.cpp

kasten/gui/io/generator/randomdata/bytearrayrandomdatagenerator.cpp

libs/kasten/controllers/documentsystem/filesystembrowser/filesystembrowserview.cpp

libs/kasten/controllers/io/copyas/copyascontroller.cpp

libs/kasten/controllers/io/export/exportcontroller.cpp

program/program.cpp

Older »