summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-12-15 17:56:04 -0500
committerJune McEnroe <june@causal.agency>2020-12-15 17:56:04 -0500
commitc2be3f9491f3c409d4535014b12a1643374e6c46 (patch)
treee4f704f14fab7637a2b91ff128e75941292bd615
parentMerge LibreSSL 3.3.0 into master (diff)
parentImport LibreSSL 3.3.1 (diff)
downloadlibretls-c2be3f9491f3c409d4535014b12a1643374e6c46.tar.gz
libretls-c2be3f9491f3c409d4535014b12a1643374e6c46.zip
Merge LibreSSL 3.3.1 into master 3.3.1
-rw-r--r--VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/VERSION b/VERSION
index 8fe1da8..bea62b7 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-3.3.0
+3.3.1
 
mp;id=46abcc7b70cfa8da069aceeddb0039b3e18827cf&follow=1'>Remove leading blank linesJune McEnroe 2017-09-27Add merge.c to READMEJune McEnroe 2017-09-03Assert client coords are valid after movementJune McEnroe 2017-09-03Relicense AGPLJune McEnroe I know it's already published under a permissive license in what is probably its final form, but I want to license it AGPL anyway on principle following some conversations I had about open source, corporations and copyleft. 2017-09-01Revert "Add client readOnly mode"June McEnroe This reverts commit 9a6c9c91c8092603b914cc0b3085d059e162ca29. 2017-09-01Remove clientRemove call from clientCastJune McEnroe If an error occurs on a client socket during a broadcast, that client will show up in the kqueue loop with EV_EOF and get removed that way. Tested by sending SIGKILL to a client and watching its cursor disappear. 2017-09-01Add client readOnly modeJune McEnroe 2017-08-31Clean up merge toolJune McEnroe Choose the version with the most recent access if the modify times are the same. 2017-08-31Choose B for tiles with equal modify timesJune McEnroe This way newer access counts and times will be preserved. 2017-08-31Add quick data file merge toolJune McEnroe Hopefully I won't have to use it ever again. 2017-08-30Use only foreground color for selecting spawnJune McEnroe 2017-08-29Add four additional spawnsJune McEnroe 2017-08-28Add respawningJune McEnroe 2017-08-26Move license above includesJune McEnroe Why was it down there? 2017-08-26Snapshot metadataJune McEnroe 2017-08-26Add meta.c to READMEJune McEnroe 2017-08-26Use MakefileJune McEnroe