From 406f14dc17a2f1de79e97382eb71230fbfa68fa6 Mon Sep 17 00:00:00 2001
From: Anders Nilsson <csandersn@garde>
Date: Thu, 14 May 2009 16:44:11 +0200
Subject: [PATCH] Synch
---
examples/actors/xdf/MergeActors.jrag | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/examples/actors/xdf/MergeActors.jrag b/examples/actors/xdf/MergeActors.jrag
index be6b16e..0c9333f 100644
--- a/examples/actors/xdf/MergeActors.jrag
+++ b/examples/actors/xdf/MergeActors.jrag
@@ -53,7 +53,9 @@ aspect MergeActors {
// }
// }
- void Instance.merge(Instance inst) {}
+ void Instance.merge(Instance inst) {
+ xlimInstance().merge(inst.xlimInstance());
+ }
}
aspect Misc {
--
GitLab