From: rtrimana <rtrimana@uci.edu>
Date: Thu, 8 Aug 2019 06:51:02 +0000 (-0700)
Subject: Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/jpf-core
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=b036e43d938736ab27659c073ec1e7f741f4c46c;p=jpf-core.git

Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/jpf-core
---

b036e43d938736ab27659c073ec1e7f741f4c46c
diff --cc main.jpf
index d9feee5,91b80aa..db82e7b
--- a/main.jpf
+++ b/main.jpf
@@@ -17,11 -17,9 +17,11 @@@ listener=gov.nasa.jpf.listener.Variable
  # Speeches
  #variables=level,oneUser
  # Music players
- #variables=status,level,trackDescription,trackData,mute
+ variables=status,duration,level,trackDescription,trackData,mute
  # Relay switch
  #variables=currentSwitch
 +# Valves
 +variables=valve,valveLatestValue
  			
  # Potentially conflicting apps (we default to App1 and App2 for now)
  apps=App1,App2