Commit 8bc90f01 authored by Arpad Lovassy's avatar Arpad Lovassy Committed by Gerrit Code Review
Browse files

Merge "A file has been renamed to avoid name collision"

parents a86ae65a 9fd3b07c
OER
OER.exe
OER.hh
OER.cc
*.log
*.o
Types.cc
Types.hh
\ No newline at end of file
OERTypes.cc
OERTypes.hh
\ No newline at end of file
......@@ -19,7 +19,7 @@ TTCN3_LIB = ttcn3$(RT2_SUFFIX)$(DYNAMIC_SUFFIX)
TTCN3_MODULES = OER.ttcn
ASN1_MODULES = Types.asn
ASN1_MODULES = OERTypes.asn
GENERATED_SOURCES = $(ASN1_MODULES:.asn=.cc) $(TTCN3_MODULES:.ttcn=.cc)
......
......@@ -11,7 +11,7 @@
******************************************************************************/
module OER {
import from Types all;
import from OERTypes all;
type component EmptyCT {
......
......@@ -9,7 +9,7 @@
-- Szabo, Bence Janos
--
--/////////////////////////////////////////////////////////////////////////////
Types
OERTypes
DEFINITIONS
AUTOMATIC TAGS
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment