Navigation

Changeset 1562:6219359a36a9 in freeDiameter


Ignore:
Timestamp:
Jun 21, 2021, 8:08:18 PM (3 years ago)
Author:
Sebastien Decugis <sdecugis@freediameter.net>
Branch:
default
Parents:
1558:932fca1cbbe4 (diff), 1561:699c3fb0c57b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Tags:
tip
Message:

Merge latest changes from proposed branch

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • CMakeLists.txt

    r1557 r1562  
    2121
    2222# CMake version
    23 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
     23CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
    2424
    2525# Location of additional CMake modules

  • CMakeLists.txt

    r1560 r1562  
    1111# Version of the source code
    1212SET(FD_PROJECT_VERSION_MAJOR 1)
    13 SET(FD_PROJECT_VERSION_MINOR 4)
     13SET(FD_PROJECT_VERSION_MINOR 5)
    1414SET(FD_PROJECT_VERSION_REV 0)
    1515
Note: See TracChangeset for help on using the changeset viewer.