[TeamTalk 310]: [846] trunk/TeamTalk: 1) Minor bugfix on requestwaitforcommands.
tk@edam.speech.cs.cmu.edu
tk at edam.speech.cs.cmu.edu
Thu Oct 18 00:50:42 EDT 2007
An HTML attachment was scrubbed...
URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20071018/dcb8ac22/attachment-0001.html
-------------- next part --------------
Modified: trunk/TeamTalk/Agents/TeamTalkDM/TeamTalkDialogTask.cpp
===================================================================
--- trunk/TeamTalk/Agents/TeamTalkDM/TeamTalkDialogTask.cpp 2007-10-18 03:17:53 UTC (rev 845)
+++ trunk/TeamTalk/Agents/TeamTalkDM/TeamTalkDialogTask.cpp 2007-10-18 04:50:42 UTC (rev 846)
@@ -351,7 +351,7 @@
// /TeamTalk/Task/RequestWaitForCommands
//-----------------------------------------------------------------------------
DEFINE_REQUEST_AGENT( CRequestWaitForCommands,
- // PROMPT("request idle <robot_name")
+ PROMPT("request nothing")
TIMEOUT_PERIOD(1000000)
)
Modified: trunk/TeamTalk/Agents/TeamTalkNLG/Rosetta.pm
===================================================================
--- trunk/TeamTalk/Agents/TeamTalkNLG/Rosetta.pm 2007-10-18 03:17:53 UTC (rev 845)
+++ trunk/TeamTalk/Agents/TeamTalkNLG/Rosetta.pm 2007-10-18 04:50:42 UTC (rev 846)
@@ -242,7 +242,6 @@
if($self->{DEBUG}) {
print "generate:\n";
}
- my $reply = ' ';
for my $k (keys %frame) {
$frame{$k} =~ s/[\cA-\cZ]+//g;
if($self->{DEBUG}) {
@@ -250,8 +249,8 @@
}
}
- $reply .= $self->getBestReply(%frame);
- if ($reply) {
+ my $reply = $self->getBestReply(%frame);
+ if (defined $reply) {
# substitute named slots for which a value is not given
# with frame contents (ANTOINE: values can be specified by
# <slot value>, in which case the output string is value)
Modified: trunk/TeamTalk/Agents/TeamTalkNLG/bin/TeamTalk
===================================================================
--- trunk/TeamTalk/Agents/TeamTalkNLG/bin/TeamTalk 2007-10-18 03:17:53 UTC (rev 845)
+++ trunk/TeamTalk/Agents/TeamTalkNLG/bin/TeamTalk 2007-10-18 04:50:42 UTC (rev 846)
@@ -6,5 +6,6 @@
my $debug_flag = shift;
-my $TeamTalk = new Rosetta::TeamTalk(port => 22345);
+$|++; #autoflush
+my $TeamTalk = new Rosetta::TeamTalk(port => 22345, DEBUG => $debug_flag);
$TeamTalk->tcp_server($debug_flag);
Deleted: trunk/TeamTalk/Agents/TeamTalkNLG/bin/beautify_chains
===================================================================
--- trunk/TeamTalk/Agents/TeamTalkNLG/bin/beautify_chains 2007-10-18 03:17:53 UTC (rev 845)
+++ trunk/TeamTalk/Agents/TeamTalkNLG/bin/beautify_chains 2007-10-18 04:50:42 UTC (rev 846)
@@ -1,38 +0,0 @@
-#!/usr/bin/perl
-
-my $mod = 0;
-
-if (-t STDIN) {
- print map &beautifyHotelChain($_), <>;
- print STDERR "# $mod modifications\n";
-}
-
-sub beautifyHotelChain {
- $_ = shift;
-
- chomp;
-
- s/\b Int l? \.? (\Z|\b)/International/x and $mod++;
- s/\b Grp \.? (\Z|\b)/Group/x and $mod++;
- s/\b Conf \.? (\Z|\b)/Conference/x and $mod++;
- s/\b Inc \.? (\Z|\b)/Incorporated/x and $mod++;
-
- s/\b Lm?td \.? /Limited/x and $mod++;
- s/\b Htl \.? /Hotel/x and $mod++;
-
- s/\b Corp \.? (\Z|\b)/Corporation/x and $mod++;
- s/\b Mktg \.? (\Z|\b)/Marketing/x and $mod++;
- s/\b Ser \.? (\Z|\b)/Service/x and $mod++;
- s/\b Rst \.? /Resort/x and $mod++;
- s/\b Tvl \.? /Travel/x and $mod++;
-
- s/\b(Srv|Svc)\.?/Service/ and $mod++;
-
- s/\b hotels (\Z|\b)/Hotel/xi and $mod++;
- s/\b inns (\Z|\b)/Inn/xi and $mod++;
- s/\b 6 $/Six/x and $mod++;
-
- s/\// /g;
-
- $_ . "\n";
-}
Deleted: trunk/TeamTalk/Agents/TeamTalkNLG/bin/beautify_chains.pl
===================================================================
--- trunk/TeamTalk/Agents/TeamTalkNLG/bin/beautify_chains.pl 2007-10-18 03:17:53 UTC (rev 845)
+++ trunk/TeamTalk/Agents/TeamTalkNLG/bin/beautify_chains.pl 2007-10-18 04:50:42 UTC (rev 846)
@@ -1,38 +0,0 @@
-#!/usr/bin/perl
-
-my $mod = 0;
-
-if (-t STDIN) {
- print map &beautifyHotelChain($_), <>;
- print STDERR "# $mod modifications\n";
-}
-
-sub beautifyHotelChain {
- $_ = shift;
-
- chomp;
-
- s/\b Int l? \.? (\Z|\b)/International/x and $mod++;
- s/\b Grp \.? (\Z|\b)/Group/x and $mod++;
- s/\b Conf \.? (\Z|\b)/Conference/x and $mod++;
- s/\b Inc \.? (\Z|\b)/Incorporated/x and $mod++;
-
- s/\b Lm?td \.? /Limited/x and $mod++;
- s/\b Htl \.? /Hotel/x and $mod++;
-
- s/\b Corp \.? (\Z|\b)/Corporation/x and $mod++;
- s/\b Mktg \.? (\Z|\b)/Marketing/x and $mod++;
- s/\b Ser \.? (\Z|\b)/Service/x and $mod++;
- s/\b Rst \.? /Resort/x and $mod++;
- s/\b Tvl \.? /Travel/x and $mod++;
-
- s/\b(Srv|Svc)\.?/Service/ and $mod++;
-
- s/\b hotels (\Z|\b)/Hotel/xi and $mod++;
- s/\b inns (\Z|\b)/Inn/xi and $mod++;
- s/\b 6 $/Six/x and $mod++;
-
- s/\// /g;
-
- $_ . "\n";
-}
Modified: trunk/TeamTalk/Configurations/DesktopConfiguration/TeamTalk-hub-desktop-skeleton.pgm
===================================================================
--- trunk/TeamTalk/Configurations/DesktopConfiguration/TeamTalk-hub-desktop-skeleton.pgm 2007-10-18 03:17:53 UTC (rev 845)
+++ trunk/TeamTalk/Configurations/DesktopConfiguration/TeamTalk-hub-desktop-skeleton.pgm 2007-10-18 04:50:42 UTC (rev 846)
@@ -137,32 +137,6 @@
LOG_IN: :inframe
LOG_OUT: :outframe
-;;PROGRAM: robot_message
-
-;;RULE: :goal | --> PenDecoder.speak
-;;IN: :robot_name :speaktext
-;;OUT:
-
-;;RULE: :type = "location" --> PenDecoder.set_bot
-;;IN: :robot_name :x :y :r
-;;OUT:
-
-;;RULE: :type = "goal" --> PenDecoder.set_goal
-;;IN: :robot_name :relative :x :y
-;;OUT:
-
-;;RULE: :type = "halt" --> PenDecoder.set_halt
-;;IN: :robot_name
-;;OUT:
-
-;;RULE: :type = "follow" --> PenDecoder.set_follow
-;;IN: :robot_name :followee
-;;OUT:
-
-;;RULE: :type = "cover" --> PenDecoder.set_cover
-;;IN: :robot_name :x :y
-;;OUT:
-
PROGRAM: restart_decoder
RULE: --> sphinx.restart_decoder
Modified: trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.cpp
===================================================================
--- trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.cpp 2007-10-18 03:17:53 UTC (rev 845)
+++ trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.cpp 2007-10-18 04:50:42 UTC (rev 846)
@@ -138,7 +138,7 @@
const Boeing::MsgRobLocation* brl =
reinterpret_cast<const Boeing::MsgRobLocation*>(m.c_str());
return new MsgRobLocation(sender, brl->tstamp,
- geometry::Point<float>(brl->x, brl->y), brl->angle, (brl->moving != 0));
+ geometry::Point<float>(brl->x, brl->y), brl->angle, (brl->moving != 0), brl->error);
}
if(type == Boeing::ROB_ACK) {
debug("packet") << "got: ROB_ACK" << endl;
@@ -565,14 +565,15 @@
MsgRobLocation::MsgRobLocation(Point<float> loc, float angle, bool moving, string sender)
: Msg(sender), loc_(loc), angle_(angle), moving_(moving) {}
-MsgRobLocation::MsgRobLocation(string sender, double tstamp, Point<float> loc, float angle, bool moving)
-: Msg(sender, tstamp), loc_(loc), angle_(angle), moving_(moving) {}
+MsgRobLocation::MsgRobLocation(string sender, double tstamp, Point<float> loc, float angle, bool moving, short error_state)
+: Msg(sender, tstamp), loc_(loc), angle_(angle), moving_(moving), error_state_(error_state) {}
Point<float> MsgRobLocation::getLocation() const {return loc_;}
float MsgRobLocation::getX() const {return loc_.x;}
float MsgRobLocation::getY() const {return loc_.y;}
float MsgRobLocation::getAngle() const {return angle_;}
bool MsgRobLocation::isMoving() const {return moving_;}
+short MsgRobLocation::getErrorState() const {return error_state_;}
bool MsgRobLocation::operator==(const MsgRobLocation& x) const {
return (loc_-x.loc_).length() <= tolerance &&
@@ -588,6 +589,7 @@
ostringstream out;
out << "roblocation: " << loc_ << angle_ << "rad "
<< (moving_? "MOVING": "STILL");
+ if(error_state_) out << " ERROR: " << error_state_;
return out.str();
}
Modified: trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.h
===================================================================
--- trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.h 2007-10-18 03:17:53 UTC (rev 845)
+++ trunk/TeamTalk/Libraries/PrimitiveComm/robot_packet2.h 2007-10-18 04:50:42 UTC (rev 846)
@@ -277,17 +277,19 @@
Point<float> loc_;
float angle_;
bool moving_;
+ short error_state_;
public:
//normal instantiation
MsgRobLocation();
MsgRobLocation(Point<float> loc, float angle, bool moving, string sender=string());
//instantiation from a Boeing packet
- MsgRobLocation(string sender, double tstamp, Point<float> loc, float angle, bool moving);
+ MsgRobLocation(string sender, double tstamp, Point<float> loc, float angle, bool moving, short error_state);
Point<float> getLocation() const;
float getX() const;
float getY() const;
float getAngle() const;
bool isMoving() const;
+ short getErrorState() const;
bool operator==(const MsgRobLocation& x) const;
bool operator!=(const MsgRobLocation& x) const;
string render() const;
Modified: trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.cc
===================================================================
--- trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.cc 2007-10-18 03:17:53 UTC (rev 845)
+++ trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.cc 2007-10-18 04:50:42 UTC (rev 846)
@@ -211,7 +211,7 @@
}
}
-int UDPSocket::recv(void* buf, int maxbytes)
+int UDPSocket::recv(void* buf, int maxbytes, struct sockaddr_in* addr)
{
if (status <= 0)
return 0;
@@ -314,6 +314,8 @@
return rv;
}
+int UDPSocket::SendTo(struct sockaddr_in* addr, const void* msg, int len) {return 0;}
+
void UDPSocket::accept()
{
if (status != Server)
Modified: trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.h
===================================================================
--- trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.h 2007-10-18 03:17:53 UTC (rev 845)
+++ trunk/TeamTalk/Libraries/PrimitiveComm/udpsocket.h 2007-10-18 04:50:42 UTC (rev 846)
@@ -136,10 +136,11 @@
bool isConnected() {return status>0; }
// Returns the number of bytes read or written.
- int recv(void *buf, int maxbytes);
+ int recv(void *buf, int maxbytes, struct sockaddr_in* addr=NULL);
int send(const void *buf, int nbytes);
+ int SendTo(struct sockaddr_in* addr, const void* msg, int length);
int recvType(void *buf, int maxbytes, char &type) {
- int rv = recv(buf, maxbytes); type = ((char *) buf)[0]; return rv; }
+ int rv = recv(buf, maxbytes); type = ((char *) buf)[0]; return rv; }
// Server specific methods
void accept();
Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.cc
===================================================================
--- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.cc 2007-10-18 03:17:53 UTC (rev 845)
+++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.cc 2007-10-18 04:50:42 UTC (rev 846)
@@ -1,12 +1,13 @@
#ifndef WIN32
#include <unistd.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
#endif
+
#include <stdarg.h>
#include <stdio.h>
#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
#include "boeing_map_server.h"
#include "timer.h"
Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.h
===================================================================
--- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.h 2007-10-18 03:17:53 UTC (rev 845)
+++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_map_server.h 2007-10-18 04:50:42 UTC (rev 846)
@@ -5,7 +5,11 @@
#ifndef __BOEING_MAP_SERVER_H__
#define __BOEING_MAP_SERVER_H__
+#ifndef WIN32
#include <netinet/in.h>
+#else
+#include <winsock2.h>
+#endif
#include "boeing_map_packet.h"
Modified: trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_packet.h
===================================================================
--- trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_packet.h 2007-10-18 03:17:53 UTC (rev 845)
+++ trunk/TeamTalk/Libraries/boeingLib/boeing/boeing_robot_packet.h 2007-10-18 04:50:42 UTC (rev 846)
@@ -239,7 +239,6 @@
return m;
};
} PACKED;
-
/// evaluation message for play manager
//this should eventually be multiple data types, not just int16_t
@@ -274,7 +273,7 @@
float angle;
int16_t moving;
int16_t error;
- static MsgRobLocation factory(float x, float y, float angle, int16_t moving, int16_t error) {
+ static MsgRobLocation factory(float x, float y, float angle, int16_t moving, int16_t error=ROB_OK) {
MsgRobLocation m;
m.x = x; m.y = y; m.angle = angle; m.moving = moving; m.error=error;
return m;
@@ -285,6 +284,7 @@
bool operator==(const MsgRobLocation& rhs) {
return !this->operator!=(rhs);
}
+ bool hasError() {return error!=ROB_OK;}
} PACKED;
/// Handshaking...why is this so large???
Modified: trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj
===================================================================
--- trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj 2007-10-18 03:17:53 UTC (rev 845)
+++ trunk/TeamTalk/TeamTalk-Setup/TeamTalk-Setup.vdproj 2007-10-18 04:50:42 UTC (rev 846)
@@ -75,6 +75,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_06C53A0A79144BF3B20E6D091BA5AF66"
+ "OwnerKey" = "8:_1F27A38B07F54BB1A085F7B8F01D27AF"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_0754644A518C4A3C8C2DCAC878545BCE"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -303,7 +309,7 @@
}
"Entry"
{
- "MsmKey" = "8:_1ED9280F00524433BFB5837ED7830502"
+ "MsmKey" = "8:_1F27A38B07F54BB1A085F7B8F01D27AF"
"OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B"
"MsmSig" = "8:_UNDEFINED"
}
@@ -423,6 +429,60 @@
}
"Entry"
{
+ "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC"
+ "OwnerKey" = "8:_4873F0E76AC142DF91AC9E30D5125A9A"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC"
+ "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC"
+ "OwnerKey" = "8:_602807E5A36A4D2DA3F11F49B2B94FE1"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC"
+ "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC"
+ "OwnerKey" = "8:_3997743B1D134081946B974C0EADC59F"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC"
+ "OwnerKey" = "8:_11D00E542BDD4CBF8941C189640DF6A4"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC"
+ "OwnerKey" = "8:_FCAD75AD5C5A4A6D9D4E9CA31AD20242"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC"
+ "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC"
+ "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_2A1CCFDD8F194F28A1F12756272FA9EA"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1389,12 +1449,6 @@
}
"Entry"
{
- "MsmKey" = "8:_868FA11D28B3499FBD873A1D9FDD0995"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_86CC12EAF6964AC19B0805582678672A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1629,12 +1683,6 @@
}
"Entry"
{
- "MsmKey" = "8:_A17F6E72C8B148F6A39F40FED97A358E"
- "OwnerKey" = "8:_1ED9280F00524433BFB5837ED7830502"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_A22C2C43252B4F84A428C71471100857"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1677,6 +1725,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_A54BC1128444473EAB4C5E0D68C78407"
+ "OwnerKey" = "8:_29CD188AB7D24EC88B5923B2D9A797CC"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_A5C9D293284B46E5A08A504E22245CF3"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1941,12 +1995,6 @@
}
"Entry"
{
- "MsmKey" = "8:_BDEFB96E13D940DD874054B868B18BF7"
- "OwnerKey" = "8:_E617026519BC40F0BE5E060A1709633F"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_BDF6C7CB9D0748FBBDC7F694C7993CA0"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -2278,31 +2326,31 @@
"Entry"
{
"MsmKey" = "8:_DDAEE798AA6303A334273AF055949421"
- "OwnerKey" = "8:_FCAD75AD5C5A4A6D9D4E9CA31AD20242"
+ "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_DDAEE798AA6303A334273AF055949421"
- "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F"
+ "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_DDAEE798AA6303A334273AF055949421"
- "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21"
+ "OwnerKey" = "8:_FCAD75AD5C5A4A6D9D4E9CA31AD20242"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_DDAEE798AA6303A334273AF055949421"
- "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B"
+ "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_DDAEE798AA6303A334273AF055949421"
- "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8"
+ "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -2325,12 +2373,6 @@
}
"Entry"
{
- "MsmKey" = "8:_DE8FCA61078347EAAAD1F0003986508A"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_DEF0051FA91E428C896D3D23444D0E1A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -2409,60 +2451,6 @@
}
"Entry"
{
- "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F"
- "OwnerKey" = "8:_11D00E542BDD4CBF8941C189640DF6A4"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F"
- "OwnerKey" = "8:_FCAD75AD5C5A4A6D9D4E9CA31AD20242"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F"
- "OwnerKey" = "8:_F58F05DC433C4028B81130B6E20CDD0F"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F"
- "OwnerKey" = "8:_D2F322A157964CC38CA9E6F7426F3B21"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F"
- "OwnerKey" = "8:_602807E5A36A4D2DA3F11F49B2B94FE1"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F"
- "OwnerKey" = "8:_5352FBB98943431F8090AB5B90E28B6B"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F"
- "OwnerKey" = "8:_4873F0E76AC142DF91AC9E30D5125A9A"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F"
- "OwnerKey" = "8:_43C22DC2412B447B86B5F8A82203A8C8"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_E617026519BC40F0BE5E060A1709633F"
- "OwnerKey" = "8:_3997743B1D134081946B974C0EADC59F"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_E731AD6F5D324159A5AE976D3DB17D9E"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -7265,26 +7253,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_868FA11D28B3499FBD873A1D9FDD0995"
- {
- "SourcePath" = "8:..\\Agents\\TeamTalkNLG\\bin\\beautify_chains"
- "TargetName" = "8:beautify_chains"
- "Tag" = "8:"
- "Folder" = "8:_B6BD363182FB405191A30FACF312AC2E"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_86CC12EAF6964AC19B0805582678672A"
{
"SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tk8.4\\demos\\browse"
@@ -10205,26 +10173,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DE8FCA61078347EAAAD1F0003986508A"
- {
- "SourcePath" = "8:..\\Agents\\TeamTalkNLG\\bin\\beautify_chains.pl"
- "TargetName" = "8:beautify_chains.pl"
- "Tag" = "8:"
- "Folder" = "8:_B6BD363182FB405191A30FACF312AC2E"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DEF0051FA91E428C896D3D23444D0E1A"
{
"SourcePath" = "8:..\\Agents\\Pythia\\dist\\tcl\\tk8.4\\demos\\labelframe.tcl"
@@ -12649,11 +12597,11 @@
}
"MergeModule"
{
- "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_1ED9280F00524433BFB5837ED7830502"
+ "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_06C53A0A79144BF3B20E6D091BA5AF66"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
- "SourcePath" = "8:Microsoft_VC80_DebugCRT_x86.msm"
+ "SourcePath" = "8:policy_8_0_microsoft_vc80_debugcrt_x86.msm"
"Properties"
{
}
@@ -12663,11 +12611,11 @@
"Feature" = "8:"
"IsolateTo" = "8:"
}
- "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_A17F6E72C8B148F6A39F40FED97A358E"
+ "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_1F27A38B07F54BB1A085F7B8F01D27AF"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
- "SourcePath" = "8:policy_8_0_microsoft_vc80_debugcrt_x86.msm"
+ "SourcePath" = "8:Microsoft_VC80_DebugCRT_x86.msm"
"Properties"
{
}
@@ -12677,11 +12625,11 @@
"Feature" = "8:"
"IsolateTo" = "8:"
}
- "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_BDEFB96E13D940DD874054B868B18BF7"
+ "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_29CD188AB7D24EC88B5923B2D9A797CC"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
- "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm"
+ "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm"
"Properties"
{
}
@@ -12691,11 +12639,11 @@
"Feature" = "8:"
"IsolateTo" = "8:"
}
- "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_E617026519BC40F0BE5E060A1709633F"
+ "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_A54BC1128444473EAB4C5E0D68C78407"
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:TRUE"
- "SourcePath" = "8:Microsoft_VC80_CRT_x86.msm"
+ "SourcePath" = "8:policy_8_0_microsoft_vc80_crt_x86.msm"
"Properties"
{
}
More information about the TeamTalk-developers
mailing list