summaryrefslogtreecommitdiff
path: root/cesar/ce/rx/test
diff options
context:
space:
mode:
authorJérémy Dufour2012-04-24 17:18:40 +0200
committerJérémy Dufour2012-05-04 14:54:47 +0200
commit181c931dfb72cebfee7d8334399ab0d744064d6e (patch)
tree20b71cf507d7e20798753d0f71a5f089ddc2a633 /cesar/ce/rx/test
parent706e5252737169d5e4b22a511f0c3e530a394d56 (diff)
parent7617b3533c2c9ca58c90f6a2ad2174c2db80d1f1 (diff)
Merge branch 'ce_rx_forward' into eoc-ce_rx_forward
Conflicts: cesar/cp/sta/action/src/vs.c
Diffstat (limited to 'cesar/ce/rx/test')
-rw-r--r--cesar/ce/rx/test/override/cp/inc/context.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cesar/ce/rx/test/override/cp/inc/context.h b/cesar/ce/rx/test/override/cp/inc/context.h
index f7bb352255..6bfbc6f0de 100644
--- a/cesar/ce/rx/test/override/cp/inc/context.h
+++ b/cesar/ce/rx/test/override/cp/inc/context.h
@@ -19,7 +19,7 @@
#include "cp/sta/mgr/inc/sta_mgr.h"
#include "cl/cl.h"
#include "mac/sar/sar.h"
-#include "ce/rx/rx.h"
+#include "ce/rx/forward.h"
#include "lib/bitstream.h"
#include "lib/rnd.h"