From 04ec3b7967883ac090911989e452c745b83ba16d Mon Sep 17 00:00:00 2001 From: max Date: Thu, 2 Jul 2020 12:24:11 +0200 Subject: [PATCH] Pd: re-upload previous rainbow.pd destroyed by automerge #%! --- examples/rainbow.pd | 106 -------------------------------------------- 1 file changed, 106 deletions(-) diff --git a/examples/rainbow.pd b/examples/rainbow.pd index 408b29b..c67a266 100644 --- a/examples/rainbow.pd +++ b/examples/rainbow.pd @@ -1,8 +1,4 @@ -<<<<<<< HEAD -#N canvas 547 398 828 731 12; -======= #N canvas 698 144 821 731 12; ->>>>>>> 2d8748675208b3c97908663eb33499dbf4213d11 #N canvas 250 355 563 749 hsv2rgb 0; #X obj 20 64 route 0; #X msg 20 36 \$2 \$3 \$1; @@ -916,11 +912,6 @@ #X msg 317 400 S4 \$1 \$2 \$3; #X msg 413 400 S5 \$1 \$2 \$3; #X msg 509 400 S6 \$1 \$2 \$3; -<<<<<<< HEAD -#X obj 294 17 loadbang; -#X obj 294 71 print toVCV; -======= ->>>>>>> 2d8748675208b3c97908663eb33499dbf4213d11 #X obj 30 92 metro 2000; #X msg 62 426 L1 \$1 \$2 \$3; #X msg 158 426 L2 \$1 \$2 \$3; @@ -929,10 +920,6 @@ #X msg 447 426 L5 \$1 \$2 \$3; #X msg 542 426 L6 \$1 \$2 \$3; #X obj 29 592 dac~ 1 2 3 4 5 6, f 69; -<<<<<<< HEAD -#X msg 294 43 display Hello world!; -======= ->>>>>>> 2d8748675208b3c97908663eb33499dbf4213d11 #X obj 29 369 t l l; #X obj 125 369 t l l; #X obj 221 369 t l l; @@ -940,10 +927,6 @@ #X obj 413 369 t l l; #X obj 509 369 t l l; #X msg 125 316 \$1 1 1; -<<<<<<< HEAD -#X msg 30 118 0 \, 100 2000; -======= ->>>>>>> 2d8748675208b3c97908663eb33499dbf4213d11 #X obj 125 201 + 16.6667; #X obj 125 227 % 100; #X obj 29 249 / 100; @@ -989,9 +972,6 @@ #X obj 316 559 +~ 1; #X obj 413 560 +~ 1; #X obj 508 560 +~ 1; -<<<<<<< HEAD -#X connect 0 0 29 0; -======= #N canvas 0 68 624 300 display 0; #X obj 29 10 loadbang; #X msg 29 34 44; @@ -1011,20 +991,10 @@ Pd \, commas separate messages., f 32; directory tidy it here is duplicated code., f 28; #X msg 30 118 100 \, 0 2000; #X connect 0 0 26 0; ->>>>>>> 2d8748675208b3c97908663eb33499dbf4213d11 #X connect 2 0 1 0; #X connect 3 0 4 0; #X connect 4 0 6 0; #X connect 5 0 0 0; -<<<<<<< HEAD -#X connect 6 0 20 0; -#X connect 7 0 56 0; -#X connect 8 0 30 0; -#X connect 9 0 31 0; -#X connect 10 0 32 0; -#X connect 11 0 33 0; -#X connect 12 0 34 0; -======= #X connect 6 0 18 0; #X connect 7 0 52 0; #X connect 8 0 27 0; @@ -1032,93 +1002,18 @@ directory tidy it here is duplicated code., f 28; #X connect 10 0 29 0; #X connect 11 0 30 0; #X connect 12 0 31 0; ->>>>>>> 2d8748675208b3c97908663eb33499dbf4213d11 #X connect 13 0 1 0; #X connect 14 0 1 0; #X connect 15 0 1 0; #X connect 16 0 1 0; #X connect 17 0 1 0; -<<<<<<< HEAD -#X connect 18 0 28 0; -#X connect 20 0 36 0; -======= #X connect 18 0 80 0; #X connect 19 0 1 0; #X connect 20 0 1 0; ->>>>>>> 2d8748675208b3c97908663eb33499dbf4213d11 #X connect 21 0 1 0; #X connect 22 0 1 0; #X connect 23 0 1 0; #X connect 24 0 1 0; -<<<<<<< HEAD -#X connect 25 0 1 0; -#X connect 26 0 1 0; -#X connect 28 0 19 0; -#X connect 29 0 2 0; -#X connect 29 1 21 0; -#X connect 30 0 13 0; -#X connect 30 1 22 0; -#X connect 31 0 14 0; -#X connect 31 1 23 0; -#X connect 32 0 15 0; -#X connect 32 1 24 0; -#X connect 33 0 16 0; -#X connect 33 1 25 0; -#X connect 34 0 17 0; -#X connect 34 1 26 0; -#X connect 35 0 8 0; -#X connect 36 0 7 0; -#X connect 37 0 38 0; -#X connect 38 0 40 0; -#X connect 39 0 5 0; -#X connect 39 0 58 0; -#X connect 40 0 35 0; -#X connect 40 0 65 0; -#X connect 41 0 42 0; -#X connect 42 0 43 0; -#X connect 42 0 66 0; -#X connect 43 0 9 0; -#X connect 44 0 45 0; -#X connect 45 0 46 0; -#X connect 45 0 67 0; -#X connect 46 0 10 0; -#X connect 47 0 48 0; -#X connect 48 0 49 0; -#X connect 48 0 68 0; -#X connect 49 0 11 0; -#X connect 50 0 51 0; -#X connect 51 0 52 0; -#X connect 51 0 69 0; -#X connect 52 0 12 0; -#X connect 53 0 41 0; -#X connect 54 0 47 0; -#X connect 55 0 50 0; -#X connect 56 0 39 0; -#X connect 56 1 37 0; -#X connect 56 2 53 0; -#X connect 56 3 57 0; -#X connect 56 4 54 0; -#X connect 56 5 55 0; -#X connect 57 0 44 0; -#X connect 59 0 76 0; -#X connect 60 0 70 0; -#X connect 61 0 72 0; -#X connect 62 0 71 0; -#X connect 63 0 73 0; -#X connect 64 0 74 0; -#X connect 70 0 77 0; -#X connect 71 0 78 0; -#X connect 72 0 79 0; -#X connect 73 0 80 0; -#X connect 74 0 81 0; -#X connect 75 0 27 0; -#X connect 76 0 75 0; -#X connect 77 0 27 1; -#X connect 78 0 27 2; -#X connect 79 0 27 3; -#X connect 80 0 27 4; -#X connect 81 0 27 5; -======= #X connect 26 0 2 0; #X connect 26 1 19 0; #X connect 27 0 13 0; @@ -1183,4 +1078,3 @@ directory tidy it here is duplicated code., f 28; #X connect 76 0 25 4; #X connect 77 0 25 5; #X connect 80 0 7 0; ->>>>>>> 2d8748675208b3c97908663eb33499dbf4213d11