Viewing all changes in revision 4851.
- Committer: Ralf Habacker
- Date: 2015-11-26 22:26:26 UTC
- mfrom: (4848.1.2)
- Revision ID: git-v1:3d1c47c2a3a153f6fcab65a98bb55bf3a353c612
Merge remote-tracking branch 'origin/Applications/15.12'
Conflicts:
CMakeLists.txt
Conflicts:
CMakeLists.txt
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
