Proto commits in 384782946/qaf

These 4 commits are when the Protocol Buffers files have changed:

2017-04-05

Merge branch 'develop' of https://github.com/384782946/qaf into develop # Conflicts: # output/bin/conf/run.xml # output/include/3rdparty/google/protobuf/any.h # output/include/3rdparty/google/protobuf/any.pb.h # output/include/3rdparty/google/protobuf/any.proto # output/include/3rdparty/google/protobuf/api.pb.h # output/include/3rdparty/google/protobuf/api.proto # output/include/3rdparty/google/protobuf/arena.h # output/include/3rdparty/google/protobuf/arenastring.h # output/include/3rdparty/google/protobuf/compiler/code_generator.h # output/include/3rdparty/google/protobuf/compiler/command_line_interface.h # output/include/3rdparty/google/protobuf/compiler/cpp/cpp_generator.h # output/include/3rdparty/google/protobuf/compiler/csharp/csharp_generator.h # output/include/3rdparty/google/protobuf/compiler/csharp/csharp_names.h # output/include/3rdparty/google/protobuf/compiler/importer.h # output/include/3rdparty/google/protobuf/compiler/java/java_generator.h # output/include/3rdparty/google/protobuf/compiler/java/java_names.h # output/include/3rdparty/google/protobuf/compiler/javanano/javanano_generator.h # output/include/3rdparty/google/protobuf/compiler/js/js_generator.h # output/include/3rdparty/google/protobuf/compiler/objectivec/objectivec_generator.h # output/include/3rdparty/google/protobuf/compiler/objectivec/objectivec_helpers.h # output/include/3rdparty/google/protobuf/compiler/parser.h # output/include/3rdparty/google/protobuf/compiler/php/php_generator.h # output/include/3rdparty/google/protobuf/compiler/plugin.h # output/include/3rdparty/google/protobuf/compiler/plugin.pb.h # output/include/3rdparty/google/protobuf/compiler/plugin.proto # output/include/3rdparty/google/protobuf/compiler/python/python_generator.h # output/include/3rdparty/google/protobuf/compiler/ruby/ruby_generator.h # output/include/3rdparty/google/protobuf/descriptor.h # output/include/3rdparty/google/protobuf/descriptor.pb.h # output/include/3rdparty/google/protobuf/descriptor.proto # output/include/3rdparty/google/protobuf/descriptor_database.h # output/include/3rdparty/google/protobuf/duration.pb.h # output/include/3rdparty/google/protobuf/duration.proto # output/include/3rdparty/google/protobuf/dynamic_message.h # output/include/3rdparty/google/protobuf/empty.pb.h # output/include/3rdparty/google/protobuf/empty.proto # output/include/3rdparty/google/protobuf/extension_set.h # output/include/3rdparty/google/protobuf/field_mask.pb.h # output/include/3rdparty/google/protobuf/field_mask.proto # output/include/3rdparty/google/protobuf/generated_enum_reflection.h # output/include/3rdparty/google/protobuf/generated_enum_util.h # output/include/3rdparty/google/protobuf/generated_message_reflection.h # output/include/3rdparty/google/protobuf/generated_message_util.h # output/include/3rdparty/google/protobuf/has_bits.h # output/include/3rdparty/google/protobuf/io/coded_stream.h # output/include/3rdparty/google/protobuf/io/gzip_stream.h # output/include/3rdparty/google/protobuf/io/printer.h # output/include/3rdparty/google/protobuf/io/strtod.h # output/include/3rdparty/google/protobuf/io/tokenizer.h # output/include/3rdparty/google/protobuf/io/zero_copy_stream.h # output/include/3rdparty/google/protobuf/io/zero_copy_stream_impl.h # output/include/3rdparty/google/protobuf/io/zero_copy_stream_impl_lite.h # output/include/3rdparty/google/protobuf/map.h # output/include/3rdparty/google/protobuf/map_entry.h # output/include/3rdparty/google/protobuf/map_entry_lite.h # output/include/3rdparty/google/protobuf/map_field.h # output/include/3rdparty/google/protobuf/map_field_inl.h # output/include/3rdparty/google/protobuf/map_field_lite.h # output/include/3rdparty/google/protobuf/map_type_handler.h # output/include/3rdparty/google/protobuf/message.h # output/include/3rdparty/google/protobuf/message_lite.h # output/include/3rdparty/google/protobuf/metadata.h # output/include/3rdparty/google/protobuf/reflection.h # output/include/3rdparty/google/protobuf/reflection_ops.h # output/include/3rdparty/google/protobuf/repeated_field.h # output/include/3rdparty/google/protobuf/service.h # output/include/3rdparty/google/protobuf/source_context.pb.h # output/include/3rdparty/google/protobuf/source_context.proto # output/include/3rdparty/google/protobuf/struct.pb.h # output/include/3rdparty/google/protobuf/struct.proto # output/include/3rdparty/google/protobuf/stubs/atomic_sequence_num.h # output/include/3rdparty/google/protobuf/stubs/atomicops.h # output/include/3rdparty/google/protobuf/stubs/atomicops_internals_arm64_gcc.h # output/include/3rdparty/google/protobuf/stubs/atomicops_internals_arm_gcc.h # output/include/3rdparty/google/protobuf/stubs/atomicops_internals_arm_qnx.h # output/include/3rdparty/google/protobuf/stubs/atomicops_internals_atomicword_compat.h # output/include/3rdparty/google/protobuf/stubs/atomicops_internals_generic_gcc.h # output/include/3rdparty/google/protobuf/stubs/atomicops_internals_macosx.h # output/include/3rdparty/google/protobuf/stubs/atomicops_internals_mips_gcc.h # output/include/3rdparty/google/protobuf/stubs/atomicops_internals_pnacl.h # output/include/3rdparty/google/protobuf/stubs/atomicops_internals_power.h # output/include/3rdparty/google/protobuf/stubs/atomicops_internals_ppc_gcc.h # output/include/3rdparty/google/protobuf/stubs/atomicops_internals_solaris.h # output/include/3rdparty/google/protobuf/stubs/atomicops_internals_tsan.h # output/include/3rdparty/google/protobuf/stubs/atomicops_internals_x86_gcc.h # output/include/3rdparty/google/protobuf/stubs/atomicops_internals_x86_msvc.h # output/include/3rdparty/google/protobuf/stubs/bytestream.h # output/include/3rdparty/google/protobuf/stubs/callback.h # output/include/3rdparty/google/protobuf/stubs/casts.h # output/include/3rdparty/google/protobuf/stubs/common.h # output/include/3rdparty/google/protobuf/stubs/fastmem.h # output/include/3rdparty/google/protobuf/stubs/hash.h # output/include/3rdparty/google/protobuf/stubs/logging.h # output/include/3rdparty/google/protobuf/stubs/macros.h # output/include/3rdparty/google/protobuf/stubs/mutex.h # output/include/3rdparty/google/protobuf/stubs/once.h # output/include/3rdparty/google/protobuf/stubs/platform_macros.h # output/include/3rdparty/google/protobuf/stubs/port.h # output/include/3rdparty/google/protobuf/stubs/scoped_ptr.h # output/include/3rdparty/google/protobuf/stubs/shared_ptr.h # output/include/3rdparty/google/protobuf/stubs/singleton.h # output/include/3rdparty/google/protobuf/stubs/status.h # output/include/3rdparty/google/protobuf/stubs/stl_util.h # output/include/3rdparty/google/protobuf/stubs/stringpiece.h # output/include/3rdparty/google/protobuf/stubs/template_util.h # output/include/3rdparty/google/protobuf/stubs/type_traits.h # output/include/3rdparty/google/protobuf/text_format.h # output/include/3rdparty/google/protobuf/timestamp.pb.h # output/include/3rdparty/google/protobuf/timestamp.proto # output/include/3rdparty/google/protobuf/type.pb.h # output/include/3rdparty/google/protobuf/type.proto # output/include/3rdparty/google/protobuf/unknown_field_set.h # output/include/3rdparty/google/protobuf/util/field_comparator.h # output/include/3rdparty/google/protobuf/util/field_mask_util.h # output/include/3rdparty/google/protobuf/util/json_util.h # output/include/3rdparty/google/protobuf/util/message_differencer.h # output/include/3rdparty/google/protobuf/util/time_util.h # output/include/3rdparty/google/protobuf/util/type_resolver.h # output/include/3rdparty/google/protobuf/util/type_resolver_util.h # output/include/3rdparty/google/protobuf/wire_format.h # output/include/3rdparty/google/protobuf/wire_format_lite.h # output/include/3rdparty/google/protobuf/wire_format_lite_inl.h # output/include/3rdparty/google/protobuf/wrappers.pb.h # output/include/3rdparty/google/protobuf/wrappers.proto # output/include/3rdparty/log4qt/appender.h # output/include/3rdparty/log4qt/appenderskeleton.h # output/include/3rdparty/log4qt/basicconfigurator.h # output/include/3rdparty/log4qt/consoleappender.h # output/include/3rdparty/log4qt/dailyrollingfileappender.h # output/include/3rdparty/log4qt/fileappender.h # output/include/3rdparty/log4qt/helpers/classlogger.h # output/include/3rdparty/log4qt/helpers/configuratorhelper.h # output/include/3rdparty/log4qt/helpers/datetime.h # output/include/3rdparty/log4qt/helpers/factory.h # output/include/3rdparty/log4qt/helpers/initialisationhelper.h # output/include/3rdparty/log4qt/helpers/logerror.h # output/include/3rdparty/log4qt/helpers/logobject.h # output/include/3rdparty/log4qt/helpers/logobjectptr.h # output/include/3rdparty/log4qt/helpers/optionconverter.h # output/include/3rdparty/log4qt/helpers/patternformatter.h # output/include/3rdparty/log4qt/helpers/properties.h # output/include/3rdparty/log4qt/hierarchy.h # output/include/3rdparty/log4qt/layout.h # output/include/3rdparty/log4qt/level.h # output/include/3rdparty/log4qt/log4qt.h # output/include/3rdparty/log4qt/log4qt_global.h # output/include/3rdparty/log4qt/logger.h # output/include/3rdparty/log4qt/loggerrepository.h # output/include/3rdparty/log4qt/loggingevent.h # output/include/3rdparty/log4qt/logmanager.h # output/include/3rdparty/log4qt/mdc.h # output/include/3rdparty/log4qt/ndc.h # output/include/3rdparty/log4qt/patternlayout.h # output/include/3rdparty/log4qt/propertyconfigurator.h # output/include/3rdparty/log4qt/rollingfileappender.h # output/include/3rdparty/log4qt/simplelayout.h # output/include/3rdparty/log4qt/ttcclayout.h # output/include/3rdparty/log4qt/writerappender.h # src/QAFCore/AbstractPlugin.h

fixup crash when load config

2017-03-23

删除inline修饰符

This commit does not contain any .proto files.

2016-09-30

添加protobuf、zlib库

The documentation is generated from this commit.