Magne Sjaastad cc5f5eddd0 Merge remote-tracking branch 'refs/remotes/origin/dev' ...

Conflicts:
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake

2017-02-22 13:12:23 +01:00

..

cafPdmCore

Added const access

2017-02-20 09:26:11 +01:00

cafPdmUiCore

Merge remote-tracking branch 'refs/remotes/origin/dev'

2017-02-22 13:12:23 +01:00

cafPdmXml

#1064 Use constexpr to verify keywords for pdmObject and pdmFields

2017-01-07 08:59:19 +01:00

cafProjectDataModel_UnitTests

[AppFwk] Updated destructors in unit tests to make sure memory is released correctly

2015-12-22 11:10:50 +01:00

cafFactory.h

#1000 System : Prepare for handling of copy/paste actions

2016-11-24 08:21:59 +01:00

cafFixedArray.h

Added missing include

2015-07-31 18:48:13 +02:00

cafOmpMutex.h

Moved CAF to Fwk/AppFwk and moved/renamed VisualizationModules to Fwk/VizFwk

2013-09-20 16:01:20 +02:00

cafPdmDocument.cpp

[Fwk] Propagate return value from QFile::open in writeFile() to caller

2015-11-20 10:49:23 +01:00

cafPdmDocument.h

[Fwk] Propagate return value from QFile::open in writeFile() to caller

2015-11-20 10:49:23 +01:00

cafPdmField.h

Copied in RPM/Fwk/AppFwk

2015-07-29 14:19:43 +02:00

cafPdmObject.h

#1064 Use constexpr to verify keywords for pdmObject and pdmFields

2017-01-07 08:59:19 +01:00

cafPdmObjectGroup.cpp

Renamed to PdmObjectCollection

2015-08-13 13:06:57 +02:00

cafPdmObjectGroup.h

Fixed copyOfTypedObjects

2015-08-14 10:17:32 +02:00

CMakeLists.txt

Copied in RPM/Fwk/AppFwk

2015-07-29 14:19:43 +02:00

PdmCore.plantuml

Copied in RPM/Fwk/AppFwk

2015-07-29 14:19:43 +02:00

PdmCoreNewNames.plantuml

Copied in RPM/Fwk/AppFwk

2015-07-29 14:19:43 +02:00

PdmModularization.plantuml

Integrated fix for undo framework. Added virtual destructors.

2015-08-13 13:06:56 +02:00

PdmOverview.plantuml

Integrated fix for undo framework. Added virtual destructors.

2015-08-13 13:06:56 +02:00