Merge remote-tracking branch 'slit/master'

1 files changed, 9 insertions, 3 deletions

diff --git a/bin/psycamp b/bin/psycamp
index 40327ea..eaae14c 100755
--- a/bin/psycamp
+++ b/bin/psycamp
@@ -632,7 +632,7 @@ X
                 next;
             }
         }
-        if ( /^(J|U|K|E|M|V|Q|X|C|F|L|W|S|R|Y)(\w?)\s*$/ ) {
+        if ( /^(J|U|K|E|M|V|Q|O|X|C|F|L|W|S|R|Y)(\w?)\s*$/ ) {
                 my $r = $2;
                 if ($r and $r ne $1) {
                         &say(BOLD, RED, ">> command $1$r not defined", RESET);
@@ -645,7 +645,8 @@ X
                         $1 eq 'E' ? 'EDITABLE' :
                         $1 eq 'M' ? 'REMASTER' :
                         $1 eq 'V' ? 'VOLATILE' :
-                        $1 eq 'Q' ? 'COOL' :
+                        $1 eq 'Q' ? 'QUIET' :
+                        $1 eq 'O' ? 'COOL' :
                         $1 eq 'X' ? 'EXPORT' :
                         $1 eq 'Y' ? 'EASY' :
                         $1 eq 'C' ? 'CRITICIZE' :
@@ -657,7 +658,11 @@ X
                 $f = $ENV{PWD}. '/'. $f unless $f =~ m!^/!;
                 my $f2 = $f;
                 # the initial (.*) is a hack to make the regexp match the last occurance in the path string rather than earlier ones
+<<<<<<< .merge_file_4zqmrn
                 unless ($f =~ s:^(.*)/(SHARE|T|COMPLETE|KEEP|EDITABLE|FAVES|WRONG|SECONDARY|REPERTOIRE|NEW|TODO|USE|DEEJAY|REMASTER|CRITICIZE|EASY|INCOMING|incomingDJ|EXPORT|VOLATILE|L8R|COOL|CHAOS|DJ|byArtist|byGenre|vol)\d?/:\1/$t/:i)
+=======
+                unless ($f =~ s:^(.*)/(SHARE|T|COMPLETE|KEEP|EDITABLE|FAVES|WRONG|SECONDARY|REPERTOIRE|NEW|TODO|USE|DEEJAY|REMASTER|CRITICIZE|EASY|INCOMING|incomingDJ|EXPORT|VOLATILE|L8R|QUIET|COOL|CHAOS|DJ|byArtist|byGenre|vol)\d?/:\1/$t/:i)
+>>>>>>> .merge_file_aXWKyv
                 {
                         &say(BOLD, RED, ">> not applicable for $f", RESET);
                         next;
@@ -1487,7 +1492,8 @@ the following uppercase commands:
         K = send to KEEP
         L = send to L8R
         M = send to REMASTER
-        Q = send to COOL
+        Q = send to QUIET
+        O = send to COOL
         R = send to REPERTOIRE
         S = send to SECONDARY
         S = send to USE