diff --git a/CHANGELOG.md b/CHANGELOG.md index 632f395d3..b4fc1c3c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ # Changelog +* [1.2.0](#120) * [1.1.0](#110) * [1.0.2](#102) * [1.0.1](#101) @@ -22,12 +23,25 @@ All notable changes to this project will be documented in this file. -## 1.1.0 +## 1.2.0 * ### Merged Pull Requests + * [Full changelog: 1.1.0...1.2.0](https://github.com/ni/nidaqmx-python/compare/1.1.0...1.2.0) + +* ### Resolved Issues + * ... + +* ### Major Changes * ... +* ### Known Issues + * ... + +## 1.1.0 +* ### Merged Pull Requests + * [Full changelog: 1.0.2...1.1.0](https://github.com/ni/nidaqmx-python/compare/1.0.2...1.1.0) + * ### Resolved Issues - * [656: Missing usage of slots in classes with DAQmx attributes](https://github.com/ni/nidaqmx-python/issues/656) + * [656: Missing usage of slots in classes with DAQmx attributes](https://github.com/ni/nidaqmx-python/issues/656) * ### Major Changes * Added support for mioDAQ configurable digital voltage. diff --git a/pyproject.toml b/pyproject.toml index 5bd6480b1..68b2e5138 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "nidaqmx" -version = "1.1.0" +version = "1.2.0-dev0" license = "MIT" description = "NI-DAQmx Python API" authors = ["NI "]