summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-05-14 18:10:11 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-05-14 18:10:11 +0200
commit08a921a94045312720e5034db2f12a40fff28e53 (patch)
treeda96bb030fdace1e800effa55b711e845fbc204b
parent1c166b40a212a047574565fa3b0c5d40cd8e2637 (diff)
parent2a7e2ef5308a04459c75087021b116bea2ae1c37 (diff)
downloadredot-engine-08a921a94045312720e5034db2f12a40fff28e53.tar.gz
Merge pull request #91942 from akien-mga/enet-1.3.18
enet: Update to 1.3.18
-rw-r--r--COPYRIGHT.txt2
-rw-r--r--thirdparty/README.md2
-rw-r--r--thirdparty/enet/LICENSE2
-rw-r--r--thirdparty/enet/enet/enet.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index a7406da0fa..0438327106 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -216,7 +216,7 @@ License: Apache-2.0
Files: ./thirdparty/enet/
Comment: ENet
-Copyright: 2002-2020, Lee Salzman
+Copyright: 2002-2024, Lee Salzman
License: Expat
Files: ./thirdparty/etcpak/
diff --git a/thirdparty/README.md b/thirdparty/README.md
index fd8fc8999e..9c4e85e7cd 100644
--- a/thirdparty/README.md
+++ b/thirdparty/README.md
@@ -194,7 +194,7 @@ commits.
## enet
- Upstream: https://github.com/lsalzman/enet
-- Version: git (c44b7d0f7ff21edb702745e4c019d0537928c373, 2024)
+- Version: 1.3.18 (2662c0de09e36f2a2030ccc2c528a3e4c9e8138a, 2024)
- License: MIT
Files extracted from upstream source:
diff --git a/thirdparty/enet/LICENSE b/thirdparty/enet/LICENSE
index 6906f8eb0b..ec14b3f09b 100644
--- a/thirdparty/enet/LICENSE
+++ b/thirdparty/enet/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2002-2020 Lee Salzman
+Copyright (c) 2002-2024 Lee Salzman
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
diff --git a/thirdparty/enet/enet/enet.h b/thirdparty/enet/enet/enet.h
index 5232f8a869..ed0dd65247 100644
--- a/thirdparty/enet/enet/enet.h
+++ b/thirdparty/enet/enet/enet.h
@@ -31,7 +31,7 @@ extern "C"
#define ENET_VERSION_MAJOR 1
#define ENET_VERSION_MINOR 3
-#define ENET_VERSION_PATCH 17
+#define ENET_VERSION_PATCH 18
#define ENET_VERSION_CREATE(major, minor, patch) (((major)<<16) | ((minor)<<8) | (patch))
#define ENET_VERSION_GET_MAJOR(version) (((version)>>16)&0xFF)
#define ENET_VERSION_GET_MINOR(version) (((version)>>8)&0xFF)