Skip to content
Snippets Groups Projects
Commit 9171d035 authored by ptizoom's avatar ptizoom
Browse files

Merge branch 'master' of https://github.com/vlm/asn1c.git into master_PTZ180317

* 'master' of https://github.com/vlm/asn1c.git: (849 commits)
  -m32 compile without asan
  fix library dependency management
  libs fix
  format integer value as INTEGER_t
  formatting
  debug origin lines
  add hidden -debug-type-naming option
  better error reporting when destination directory is not available
  slash-terminate differently
  update doc and changelog
  Add -gen-autotools option generates example configure.ac and Makefile.am
  Generate Makefile.am.asn1convert
  Rename Makefile.am.example => converter-example.mk
  autotools: Make Makefile.am.libasncodec more autotools friendly
  Add '-D destdir' option for generated files
  Rename ASN_MODULE_{SOURCES,HEADERS} => ASN_MODULE_{SRCS,HDRS}
  add asn_encode* and other encoders
  constness fix
  updated doc
  rename a bit for consistency
  ...

# Conflicts:
#	.gitignore
#	Makefile.am
#	asn1c/asn1c.c
#	asn1c/unber.c
#	configure.ac
#	examples/Makefile.am
#	libasn1compiler/asn1c_C.c
#	libasn1compiler/asn1c_constraint.c
#	libasn1compiler/asn1c_misc.c
#	libasn1compiler/asn1c_out.h
#	libasn1compiler/asn1compiler.h
#	skeletons/ANY.c
#	skeletons/BIT_STRING.c
#	skeletons/BMPString.c
#	skeletons/BOOLEAN.c
#	skeletons/BOOLEAN.h
#	skeletons/ENUMERATED.c
#	skeletons/GeneralString.c
#	skeletons/GeneralizedTime.c
#	skeletons/GraphicString.c
#	skeletons/IA5String.c
#	skeletons/INTEGER.c
#	skeletons/INTEGER.h
#	skeletons/ISO646String.c
#	skeletons/Makefile.am
#	skeletons/NULL.c
#	skeletons/NULL.h
#	skeletons/NativeEnumerated.c
#	skeletons/NativeInteger.c
#	skeletons/NativeInteger.h
#	skeletons/NativeReal.c
#	skeletons/NativeReal.h
#	skeletons/NumericString.c
#	skeletons/OBJECT_IDENTIFIER.c
#	skeletons/OCTET_STRING.c
#	skeletons/OCTET_STRING.h
#	skeletons/ObjectDescriptor.c
#	skeletons/PrintableString.c
#	skeletons/REAL.c
#	skeletons/REAL.h
#	skeletons/RELATIVE-OID.c
#	skeletons/T61String.c
#	skeletons/TeletexString.c
#	skeletons/UTCTime.c
#	skeletons/UTF8String.c
#	skeletons/UniversalString.c
#	skeletons/VideotexString.c
#	skeletons/VisibleString.c
#	skeletons/asn_internal.h
#	skeletons/constr_CHOICE.c
#	skeletons/constr_CHOICE.h
#	skeletons/constr_SEQUENCE.c
#	skeletons/constr_SEQUENCE.h
#	skeletons/constr_SEQUENCE_OF.c
#	skeletons/constr_SEQUENCE_OF.h
#	skeletons/constr_SET.c
#	skeletons/constr_SET.h
#	skeletons/constr_SET_OF.c
#	skeletons/constr_SET_OF.h
#	skeletons/constr_TYPE.h
#	skeletons/converter-sample.c
#	skeletons/file-dependencies
#	skeletons/per_decoder.c
#	skeletons/per_encoder.c
#	skeletons/per_support.c
#	skeletons/per_support.h
parents 8bc364ad 4cc779fd
No related branches found
Tags v0.9.28_oai_ptz180317
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment