Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Max G 2015-07-20 22:32:16 +03:00
commit 31a3a9132d

View File

@ -4189,7 +4189,7 @@
cab cab
(cold ' ' dot) (cold ' ' dot)
(cook tuft (ifix [sig dot] hex)) (cook tuft (ifix [sig dot] hex))
(cold '~' ;~(plug sig sig)) ;~(pfix sig ;~(pose sig dot))
== ==
++ voy ;~(pfix bas ;~(pose bas soq bix)) ++ voy ;~(pfix bas ;~(pose bas soq bix))
-- --