zygo: reset to 3.3.5 w/config from 3.0.30-zb5s

(cherry picked from commit 0c265d3fc7853aff905b04fe9737cc7909933351)
(cherry picked from commit 0a0423cc33d845653d1717d407b298feb38b8cef)
(cherry picked from commit bfa6f0aefc0333d3319192b7e9030505d90842ad)
(cherry picked from commit 5a64bc5b14e340b306db2841a6add22e7cddc754)

Conflicts:

	Makefile

diff --git a/Makefile b/Makefile
index 64615e9399fa3cd3a56886cdd32d213ab77ad91b..682d2f1cc42a842b49a6c1f686f98c4d8239d958 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,8 @@ SUBLEVEL = 5
 EXTRAVERSION =
 NAME = Saber-toothed Squirrel
 
+EXTRAVERSION := $(EXTRAVERSION)-zb5s
+
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
 # More info can be located in ./README