Skip to content

Commit

Permalink
Merge pull request #324 from microsoft/master
Browse files Browse the repository at this point in the history
Merge v0.4.1 to develop
  • Loading branch information
abeltrano authored Jul 22, 2024
2 parents ddd989b + 7b4d715 commit ae0e907
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .docker/netremote-dev/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "netremote",
"version-string": "0.4.0",
"version-string": "0.4.1",
"dependencies": [
{
"name": "sdbus-cpp",
Expand Down
2 changes: 1 addition & 1 deletion cmake/version.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Default version values in case we can't get them from git.
set(VERSION_MAJOR 0)
set(VERSION_MINOR 4)
set(VERSION_PATCH 0)
set(VERSION_PATCH 1)

if (NOT GIT_EXECUTABLE)
message(WARNING "Git not found; falling back to hard-coded version")
Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "netremote",
"version-string": "0.4.0",
"version-string": "0.4.1",
"dependencies": [
{
"name": "sdbus-cpp",
Expand Down

0 comments on commit ae0e907

Please sign in to comment.