Merge commit '6800ccd52332276ab167dfa693f4e18953946257' into 400

[newsbot]

автор: VladimirMangos


<pre>m .gitignore
+ CMakeLists.txt
- Makefile.am
m README
+ cmake/FindACE.cmake
+ cmake/FindGit.cmake
+ cmake/FindMySQL.cmake
+ cmake/FindOpenSSL.cmake
+ cmake/FindPCHSupport.cmake
+ cmake/FindPlatform.cmake
+ cmake/FindReadline.cmake
+ cmake/FindTBB.cmake
+ cmake/FindTermcap.cmake
+ cmake/FindVisualStudio2010.cmake
+ cmake/ImportACE.cmake
+ cmake/ImportTBB.cmake
+ cmake/cmake_uninstall.cmake.in
+ config.h.cmake
- configure.ac
m contrib/git_id/git_id.cpp
+ createprojects.bat
+ dep/ACE_wrappers/ACE.mwc
+ dep/ACE_wrappers/ACE_vc10.sln
+ dep/ACE_wrappers/ACE_vc8.sln
+ dep/ACE_wrappers/ACE_vc9.sln
+ dep/ACE_wrappers/ACE_wrappers_vc10.sln
+ dep/ACE_wrappers/ACE_wrappers_vc8.sln
+ dep/ACE_wrappers/ACE_wrappers_vc9.sln
+ dep/ACE_wrappers/CMakeLists.txt
- dep/ACE_wrappers/FAQ
+ dep/ACE_wrappers/GNUmakefile
m dep/ACE_wrappers/Makefile.am
+ dep/ACE_wrappers/Makefile.in
+ dep/ACE_wrappers/ace/ACE_vc10.vcxproj
+ dep/ACE_wrappers/ace/ACE_vc10.vcxproj.filters
+ dep/ACE_wrappers/ace/ACE_vc8.vcproj
+ dep/ACE_wrappers/ace/ACE_vc9.vcproj
m dep/ACE_wrappers/ace/Configuration_Import_Export.cpp
+ dep/ACE_wrappers/ace/ETCL/ACE_ETCL.pc.in
+ dep/ACE_wrappers/ace/ETCL/ACE_ETCL_Parser.pc.in
+ dep/ACE_wrappers/ace/ETCL/ACE_ETCL_Parser_vc10.vcxproj
+ dep/ACE_wrappers/ace/ETCL/ACE_ETCL_Parser_vc10.vcxproj.filters
+ dep/ACE_wrappers/ace/ETCL/ACE_ETCL_Parser_vc8.vcproj
+ dep/ACE_wrappers/ace/ETCL/ACE_ETCL_Parser_vc9.vcproj
+ dep/ACE_wrappers/ace/ETCL/ACE_ETCL_vc10.vcxproj
+ dep/ACE_wrappers/ace/ETCL/ACE_ETCL_vc10.vcxproj.filters
+ dep/ACE_wrappers/ace/ETCL/ACE_ETCL_vc8.vcproj
+ dep/ACE_wrappers/ace/ETCL/ACE_ETCL_vc9.vcproj
+ dep/ACE_wrappers/ace/ETCL/ETCL.ll
+ dep/ACE_wrappers/ace/ETCL/ETCL.mpc
+ dep/ACE_wrappers/ace/ETCL/ETCL.yy
+ dep/ACE_wrappers/ace/ETCL/ETCL_Constraint.cpp
+ dep/ACE_wrappers/ace/ETCL/ETCL_Constraint.h
+ dep/ACE_wrappers/ace/ETCL/ETCL_Constraint.inl
+ dep/ACE_wrappers/ace/ETCL/ETCL_Constraint_Visitor.cpp
+ dep/ACE_wrappers/ace/ETCL/ETCL_Constraint_Visitor.h
+ dep/ACE_wrappers/ace/ETCL/ETCL_Interpreter.cpp
+ dep/ACE_wrappers/ace/ETCL/ETCL_Interpreter.h
+ dep/ACE_wrappers/ace/ETCL/ETCL_l.cpp
+ dep/ACE_wrappers/ace/ETCL/ETCL_l.cpp.diff
+ dep/ACE_wrappers/ace/ETCL/ETCL_vc10.sln
+ dep/ACE_wrappers/ace/ETCL/ETCL_vc8.sln
+ dep/ACE_wrappers/ace/ETCL/ETCL_vc9.sln
+ dep/ACE_wrappers/ace/ETCL/ETCL_y.cpp
+ dep/ACE_wrappers/ace/ETCL/ETCL_y.cpp.diff
+ dep/ACE_wrappers/ace/ETCL/ETCL_y.h
+ dep/ACE_wrappers/ace/ETCL/ETCL_y.h.diff
+ dep/ACE_wrappers/ace/ETCL/GNUmakefile
+ dep/ACE_wrappers/ace/ETCL/GNUmakefile.ACE_ETCL
+ dep/ACE_wrappers/ace/ETCL/GNUmakefile.ACE_ETCL_Parser
+ dep/ACE_wrappers/ace/ETCL/Makefile.am
+ dep/ACE_wrappers/ace/ETCL/Makefile.in
+ dep/ACE_wrappers/ace/ETCL/ace_etcl_export.h
+ dep/ACE_wrappers/ace/ETCL/etcl_parser_export.h
+ dep/ACE_wrappers/ace/FlReactor/ACE_FlReactor.pc.in
+ dep/ACE_wrappers/ace/FlReactor/ACE_FlReactor_export.h
+ dep/ACE_wrappers/ace/FlReactor/FlReactor.cpp
+ dep/ACE_wrappers/ace/FlReactor/FlReactor.h
+ dep/ACE_wrappers/ace/FlReactor/GNUmakefile
+ dep/ACE_wrappers/ace/FlReactor/GNUmakefile.ACE_FlReactor
+ dep/ACE_wrappers/ace/FlReactor/ace_flreactor.mpc
+ dep/ACE_wrappers/ace/FoxReactor/ACE_FoxReactor.pc.in
+ dep/ACE_wrappers/ace/FoxReactor/ACE_FoxReactor_export.h
+ dep/ACE_wrappers/ace/FoxReactor/FoxReactor.cpp
+ dep/ACE_wrappers/ace/FoxReactor/FoxReactor.h
+ dep/ACE_wrappers/ace/FoxReactor/ace_foxreactor.mpc
+ dep/ACE_wrappers/ace/GNUmakefile
+ dep/ACE_wrappers/ace/GNUmakefile.ACE
m dep/ACE_wrappers/ace/Makefile.am
+ dep/ACE_wrappers/ace/Makefile.in
+ dep/ACE_wrappers/ace/Monitor_Control/Auto_Update_Starter.cpp
+ dep/ACE_wrappers/ace/Monitor_Control/Auto_Update_Starter.h
+ dep/ACE_wrappers/ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp
+ dep/ACE_wrappers/ace/Monitor_Control/BSD_Network_Interface_Monitor.h
+ dep/ACE_wrappers/ace/Monitor_Control/Bytes_Received_Monitor.cpp
+ dep/ACE_wrappers/ace/Monitor_Control/Bytes_Received_Monitor.h
+ dep/ACE_wrappers/ace/Monitor_Control/Bytes_Sent_Monitor.cpp
+ dep/ACE_wrappers/ace/Monitor_Control/Bytes_Sent_Monitor.h
+ dep/ACE_wrappers/ace/Monitor_Control/CPU_Load_Monitor.cpp
+ dep/ACE_wrappers/ace/Monitor_Control/CPU_Load_Monitor.h
+ dep/ACE_wrappers/ace/Monitor_Control/Constraint_Interpreter.cpp
+ dep/ACE_wrappers/ace/Monitor_Control/Constraint_Interpreter.h
+ dep/ACE_wrappers/ace/Monitor_Control/Constraint_Visitor.cpp
+ dep/ACE_wrappers/ace/Monitor_Control/Constraint_Visitor.h
+ dep/ACE_wrappers/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.cpp
+ dep/ACE_wrappers/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h
+ dep/ACE_wrappers/ace/Monitor_Control/GNUmakefile
+ dep/ACE_wrappers/ace/Monitor_Control/GNUmakefile.Monitor_Control
+ dep/ACE_wrappers/ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp
+ dep/ACE_wrappers/ace/Monitor_Control/Linux_Network_Interface_Monitor.h
+ dep/ACE_wrappers/ace/Monitor_Control/Makefile.am
+ dep/ACE_wrappers/ace/Monitor_Control/Makefile.in
+ dep/ACE_wrappers/ace/Monitor_Control/Memory_Usage_Monitor.cpp
+ dep/ACE_wrappers/ace/Monitor_Control/Memory_Usage_Monitor.h
+ dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control.h
+ dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control.mpc
+ dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control.vsd
+ dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_export.h
+ dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_utils.h
+ dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc10.sln
+ dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc10.vcxproj
+ dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc10.vcxproj.filters
+ dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc8.sln
+ dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc8.vcproj
+ dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc9.sln
+ dep/ACE_wrappers/ace/Monitor_Control/Monitor_Control_vc9.vcproj
+ dep/ACE_wrappers/ace/Monitor_Control/Monitor_Group.cpp
+ dep/ACE_wrappers/ace/Monitor_Control/Monitor_Group.h
+ dep/ACE_wrappers/ace/Monitor_Control/Monitor_Query.cpp
+ dep/ACE_wrappers/ace/Monitor_Control/Monitor_Query.h
+ dep/ACE_wrappers/ace/Monitor_Control/Null_Network_Interface_Monitor.cpp
+ dep/ACE_wrappers/ace/Monitor_Control/Null_Network_Interface_Monitor.h
+ dep/ACE_wrappers/ace/Monitor_Control/Num_Threads_Monitor.cpp
+ dep/ACE_wrappers/ace/Monitor_Control/Num_Threads_Monitor.h
+ dep/ACE_wrappers/ace/Monitor_Control/Packets_Received_Monitor.cpp
+ dep/ACE_wrappers/ace/Monitor_Control/Packets_Received_Monitor.h
+ dep/ACE_wrappers/ace/Monitor_Control/Packets_Sent_Monitor.cpp
+ dep/ACE_wrappers/ace/Monitor_Control/Packets_Sent_Monitor.h
+ dep/ACE_wrappers/ace/Monitor_Control/Solaris_Network_Interface_Monitor.cpp
+ dep/ACE_wrappers/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h
+ dep/ACE_wrappers/ace/Monitor_Control/Windows_Monitor.cpp
+ dep/ACE_wrappers/ace/Monitor_Control/Windows_Monitor.h
+ dep/ACE_wrappers/ace/Monitor_Control/Windows_Multi_Instance_Monitor.cpp
+ dep/ACE_wrappers/ace/Monitor_Control/Windows_Multi_Instance_Monitor.h
m dep/ACE_wrappers/ace/OS_NS_string.inl
+ dep/ACE_wrappers/ace/QoS/ACE_QoS.pc.in
+ dep/ACE_wrappers/ace/QoS/ACE_QoS_Export.h
+ dep/ACE_wrappers/ace/QoS/Makefile.am
+ dep/ACE_wrappers/ace/QoS/Makefile.in
+ dep/ACE_wrappers/ace/QoS/QoS_Decorator.cpp
+ dep/ACE_wrappers/ace/QoS/QoS_Decorator.h
+ dep/ACE_wrappers/ace/QoS/QoS_Manager.cpp
+ dep/ACE_wrappers/ace/QoS/QoS_Manager.h
+ dep/ACE_wrappers/ace/QoS/QoS_Session.h
+ dep/ACE_wrappers/ace/QoS/QoS_Session_Factory.cpp
+ dep/ACE_wrappers/ace/QoS/QoS_Session_Factory.h
+ dep/ACE_wrappers/ace/QoS/QoS_Session_Impl.cpp
+ dep/ACE_wrappers/ace/QoS/QoS_Session_Impl.h
+ dep/ACE_wrappers/ace/QoS/QoS_Session_Impl.inl
+ dep/ACE_wrappers/ace/QoS/QoS_vc10.sln
+ dep/ACE_wrappers/ace/QoS/QoS_vc10.vcxproj
+ dep/ACE_wrappers/ace/QoS/QoS_vc10.vcxproj.filters
+ dep/ACE_wrappers/ace/QoS/QoS_vc8.sln
+ dep/ACE_wrappers/ace/QoS/QoS_vc8.vcproj
+ dep/ACE_wrappers/ace/QoS/QoS_vc9.sln
+ dep/ACE_wrappers/ace/QoS/QoS_vc9.vcproj
+ dep/ACE_wrappers/ace/QoS/README
+ dep/ACE_wrappers/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
+ dep/ACE_wrappers/ace/QoS/SOCK_Dgram_Mcast_QoS.h
+ dep/ACE_wrappers/ace/QoS/SOCK_Dgram_Mcast_QoS.inl
+ dep/ACE_wrappers/ace/QoS/qos.mpc
+ dep/ACE_wrappers/ace/QtReactor/ACE_QtReactor.pc.in
+ dep/ACE_wrappers/ace/QtReactor/ACE_QtReactor_export.h
+ dep/ACE_wrappers/ace/QtReactor/GNUmakefile
+ dep/ACE_wrappers/ace/QtReactor/GNUmakefile.ACE_Qt3Reactor
+ dep/ACE_wrappers/ace/QtReactor/GNUmakefile.ACE_Qt3Reactor_moc
+ dep/ACE_wrappers/ace/QtReactor/QtReactor.cpp
+ dep/ACE_wrappers/ace/QtReactor/QtReactor.h
+ dep/ACE_wrappers/ace/QtReactor/ace_qt3reactor.mpc
+ dep/ACE_wrappers/ace/QtReactor/ace_qt4reactor.mpc
+ dep/ACE_wrappers/ace/SSL/ACE_SSL.pc.in
+ dep/ACE_wrappers/ace/SSL/GNUmakefile
+ dep/ACE_wrappers/ace/SSL/GNUmakefile.SSL
+ dep/ACE_wrappers/ace/SSL/Makefile.am
+ dep/ACE_wrappers/ace/SSL/Makefile.in
+ dep/ACE_wrappers/ace/SSL/SSL_Asynch_BIO.cpp
+ dep/ACE_wrappers/ace/SSL/SSL_Asynch_BIO.h
+ dep/ACE_wrappers/ace/SSL/SSL_Asynch_Stream.cpp
+ dep/ACE_wrappers/ace/SSL/SSL_Asynch_Stream.h
+ dep/ACE_wrappers/ace/SSL/SSL_Asynch_Stream.inl
+ dep/ACE_wrappers/ace/SSL/SSL_Context.cpp
+ dep/ACE_wrappers/ace/SSL/SSL_Context.h
+ dep/ACE_wrappers/ace/SSL/SSL_Context.inl
+ dep/ACE_wrappers/ace/SSL/SSL_Export.h
+ dep/ACE_wrappers/ace/SSL/SSL_SOCK.cpp
+ dep/ACE_wrappers/ace/SSL/SSL_SOCK.h
+ dep/ACE_wrappers/ace/SSL/SSL_SOCK.inl
+ dep/ACE_wrappers/ace/SSL/SSL_SOCK_Acceptor.cpp
+ dep/ACE_wrappers/ace/SSL/SSL_SOCK_Acceptor.h
+ dep/ACE_wrappers/ace/SSL/SSL_SOCK_Acceptor.inl
+ dep/ACE_wrappers/ace/SSL/SSL_SOCK_Connector.cpp
+ dep/ACE_wrappers/ace/SSL/SSL_SOCK_Connector.h
+ dep/ACE_wrappers/ace/SSL/SSL_SOCK_Connector.inl
+ dep/ACE_wrappers/ace/SSL/SSL_SOCK_Stream.cpp
+ dep/ACE_wrappers/ace/SSL/SSL_SOCK_Stream.h
+ dep/ACE_wrappers/ace/SSL/SSL_SOCK_Stream.inl
+ dep/ACE_wrappers/ace/SSL/ssl.mpc
+ dep/ACE_wrappers/ace/SSL/ssl_for_tao.mpc
+ dep/ACE_wrappers/ace/SSL/sslconf.h
+ dep/ACE_wrappers/ace/TkReactor/ACE_TkReactor.pc.in
+ dep/ACE_wrappers/ace/TkReactor/ACE_TkReactor_export.h
+ dep/ACE_wrappers/ace/TkReactor/GNUmakefile
+ dep/ACE_wrappers/ace/TkReactor/GNUmakefile.ACE_TkReactor
+ dep/ACE_wrappers/ace/TkReactor/TkReactor.cpp
+ dep/ACE_wrappers/ace/TkReactor/TkReactor.h
+ dep/ACE_wrappers/ace/TkReactor/ace_tkreactor.mpc
+ dep/ACE_wrappers/ace/XtReactor/ACE_XtReactor.pc.in
+ dep/ACE_wrappers/ace/XtReactor/ACE_XtReactor_export.h
+ dep/ACE_wrappers/ace/XtReactor/GNUmakefile
+ dep/ACE_wrappers/ace/XtReactor/GNUmakefile.ACE_XtReactor
+ dep/ACE_wrappers/ace/XtReactor/XtReactor.cpp
+ dep/ACE_wrappers/ace/XtReactor/XtReactor.h
+ dep/ACE_wrappers/ace/XtReactor/ace_xtreactor.mpc
+ dep/ACE_wrappers/ace/ace_vc10.sln
+ dep/ACE_wrappers/ace/ace_vc8.sln
+ dep/ACE_wrappers/ace/ace_vc9.sln
m dep/ACE_wrappers/ace/config-macros.h
m dep/ACE_wrappers/ace/config-win32-common.h
+ dep/ACE_wrappers/ace/config.h.in
+ dep/ACE_wrappers/ace/config.h.win
+ dep/ACE_wrappers/aclocal.m4
+ dep/ACE_wrappers/aux_config/config.guess
+ dep/ACE_wrappers/aux_config/config.sub
+ dep/ACE_wrappers/aux_config/depcomp
+ dep/ACE_wrappers/aux_config/install-sh
+ dep/ACE_wrappers/aux_config/ltmain.sh
+ dep/ACE_wrappers/aux_config/missing
+ dep/ACE_wrappers/bin/ACE-casts-convert
+ dep/ACE_wrappers/bin/ACETAOCIAO.style
+ dep/ACE_wrappers/bin/ACEutils.pm
+ dep/ACE_wrappers/bin/GNUmakefile
+ dep/ACE_wrappers/bin/GNUmakefile.bin
+ dep/ACE_wrappers/bin/Makefile.am
+ dep/ACE_wrappers/bin/Makefile.in
+ dep/ACE_wrappers/bin/PerlACE/ConfigList.pm
+ dep/ACE_wrappers/bin/PerlACE/GNUmakefile
+ dep/ACE_wrappers/bin/PerlACE/GNUmakefile.PerlACE
+ dep/ACE_wrappers/bin/PerlACE/MSProject.pm
+ dep/ACE_wrappers/bin/PerlACE/MSProject/DSP.pm
+ dep/ACE_wrappers/bin/PerlACE/MSProject/VCP.pm
+ dep/ACE_wrappers/bin/PerlACE/Makefile.am
+ dep/ACE_wrappers/bin/PerlACE/Makefile.in
+ dep/ACE_wrappers/bin/PerlACE/PerlACE_vc10.sln
+ dep/ACE_wrappers/bin/PerlACE/PerlACE_vc10.vcxproj
+ dep/ACE_wrappers/bin/PerlACE/PerlACE_vc10.vcxproj.filters
+ dep/ACE_wrappers/bin/PerlACE/PerlACE_vc8.sln
+ dep/ACE_wrappers/bin/PerlACE/PerlACE_vc8.vcproj
+ dep/ACE_wrappers/bin/PerlACE/PerlACE_vc9.sln
+ dep/ACE_wrappers/bin/PerlACE/PerlACE_vc9.vcproj
+ dep/ACE_wrappers/bin/PerlACE/Process.pm
+ dep/ACE_wrappers/bin/PerlACE/ProcessLVRT.pm
+ dep/ACE_wrappers/bin/PerlACE/ProcessVX.pm
+ dep/ACE_wrappers/bin/PerlACE/ProcessVX_Unix.pm
+ dep/ACE_wrappers/bin/PerlACE/ProcessVX_Win32.pm
+ dep/ACE_wrappers/bin/PerlACE/ProcessWinCE.pm
+ dep/ACE_wrappers/bin/PerlACE/ProcessWinCE_Unix.pm
+ dep/ACE_wrappers/bin/PerlACE/Process_Unix.pm
+ dep/ACE_wrappers/bin/PerlACE/Process_VMS.pm
+ dep/ACE_wrappers/bin/PerlACE/Process_Win32.pm
+ dep/ACE_wrappers/bin/PerlACE/README
+ dep/ACE_wrappers/bin/PerlACE/Run_Test.pm
+ dep/ACE_wrappers/bin/PerlACE/TestTarget.pm
+ dep/ACE_wrappers/bin/PerlACE/TestTarget_LVRT.pm
+ dep/ACE_wrappers/bin/PerlACE/TestTarget_VxWorks.pm
+ dep/ACE_wrappers/bin/PerlACE/TestTarget_WinCE.pm
+ dep/ACE_wrappers/bin/PerlACE/perlace.mpc
+ dep/ACE_wrappers/bin/Uniqueid.pm
+ dep/ACE_wrappers/bin/ace-install
+ dep/ACE_wrappers/bin/ace_components
+ dep/ACE_wrappers/bin/ace_install_pkgconfig.pl
+ dep/ACE_wrappers/bin/ace_ld
+ dep/ACE_wrappers/bin/ace_tests.lst
+ dep/ACE_wrappers/bin/add_rel_link.sh
+ dep/ACE_wrappers/bin/aix_shr
+ dep/ACE_wrappers/bin/auto_compile
+ dep/ACE_wrappers/bin/auto_compile_wrapper
+ dep/ACE_wrappers/bin/auto_ptr.perl
+ dep/ACE_wrappers/bin/auto_run_tests.pl
+ dep/ACE_wrappers/bin/autoconf_compile
+ dep/ACE_wrappers/bin/autoconf_compile_wrapper
+ dep/ACE_wrappers/bin/bin.mpc
+ dep/ACE_wrappers/bin/bin_vc10.sln
+ dep/ACE_wrappers/bin/bin_vc10.vcxproj
+ dep/ACE_wrappers/bin/bin_vc10.vcxproj.filters
+ dep/ACE_wrappers/bin/bin_vc8.sln
+ dep/ACE_wrappers/bin/bin_vc8.vcproj
+ dep/ACE_wrappers/bin/bin_vc9.sln
+ dep/ACE_wrappers/bin/bin_vc9.vcproj
+ dep/ACE_wrappers/bin/bootstrap
+ dep/ACE_wrappers/bin/cle.pl
+ dep/ACE_wrappers/bin/clean_dsp.pl
+ dep/ACE_wrappers/bin/clean_sems.sh
+ dep/ACE_wrappers/bin/clone.csh
+ dep/ACE_wrappers/bin/cltime.pl
+ dep/ACE_wrappers/bin/copy-script.sh
+ dep/ACE_wrappers/bin/count_lines
+ dep/ACE_wrappers/bin/create_ace_build
+ dep/ACE_wrappers/bin/create_ace_build.pl
+ dep/ACE_wrappers/bin/depgen.pl
+ dep/ACE_wrappers/bin/diff-builds-and-group-fixed-tests-only.sh
+ dep/ACE_wrappers/bin/diff-builds.pl
+ dep/ACE_wrappers/bin/doxygen-convert-h.pl
+ dep/ACE_wrappers/bin/envinfo.cpp
+ dep/ACE_wrappers/bin/footprint_stats.sh
+ dep/ACE_wrappers/bin/fuzz.pl
+ dep/ACE_wrappers/bin/g++_metric.sh
+ dep/ACE_wrappers/bin/g++dep
+ dep/ACE_wrappers/bin/generate_compile_stats.sh
+ dep/ACE_wrappers/bin/generate_doxygen.pl
+ dep/ACE_wrappers/bin/generate_export_file.pl
+ dep/ACE_wrappers/bin/generate_footprint_chart.sh
+ dep/ACE_wrappers/bin/generate_performance_chart.sh
+ dep/ACE_wrappers/bin/generate_rel_manpages
+ dep/ACE_wrappers/bin/generate_topinfo_charts.sh
+ dep/ACE_wrappers/bin/group_test_stats.sh
+ dep/ACE_wrappers/bin/indent_macros.pl
+ dep/ACE_wrappers/bin/libsize.pl
+ dep/ACE_wrappers/bin/mail_test_stats.sh
+ dep/ACE_wrappers/bin/main2TMAIN.pl
+ dep/ACE_wrappers/bin/make-components
+ dep/ACE_wrappers/bin/make_release.py
+ dep/ACE_wrappers/bin/mpc-mode.el
+ dep/ACE_wrappers/bin/mpc.pl
+ dep/ACE_wrappers/bin/msvc_mpc_auto_compile.pl
+ dep/ACE_wrappers/bin/msvc_static_compile.pl
+ dep/ACE_wrappers/bin/msvc_static_order.lst
+ dep/ACE_wrappers/bin/mwc.pl
+ dep/ACE_wrappers/bin/package_copy_script.sh
+ dep/ACE_wrappers/bin/performance_stats.sh
+ dep/ACE_wrappers/bin/pippen.pl
+ dep/ACE_wrappers/bin/regenerate_exports.pl
+ dep/ACE_wrappers/bin/reverse_clean
+ dep/ACE_wrappers/bin/sets-manager.py
+ dep/ACE_wrappers/bin/show_unused_macros.pl
+ dep/ACE_wrappers/bin/split-cpp.pl
+ dep/ACE_wrappers/bin/svcconf-convert.pl
+ dep/ACE_wrappers/bin/svn_props.py
+ dep/ACE_wrappers/bin/topinfo_iorsize_stats.sh
+ dep/ACE_wrappers/bin/topinfo_simple_stats.sh
+ dep/ACE_wrappers/bin/topinfo_stats.sh
+ dep/ACE_wrappers/bin/update-ace+tao.sh
+ dep/ACE_wrappers/bin/vx_repo_link.pl
+ dep/ACE_wrappers/configure
m dep/ACE_wrappers/configure.ac
+ dep/ACE_wrappers/configure.ac~
+ dep/ACE_wrappers/contrib/FaCE/ACE.ico
+ dep/ACE_wrappers/contrib/FaCE/ACE_Racer.bmp
+ dep/ACE_wrappers/contrib/FaCE/CE_ARGV.cpp
+ dep/ACE_wrappers/contrib/FaCE/CE_ARGV.h
+ dep/ACE_wrappers/contrib/FaCE/CE_Screen_Output.cpp
+ dep/ACE_wrappers/contrib/FaCE/CE_Screen_Output.h
+ dep/ACE_wrappers/contrib/FaCE/FACE.ico
+ dep/ACE_wrappers/contrib/FaCE/FaCE.cpp
+ dep/ACE_wrappers/contrib/FaCE/FaCE.h
+ dep/ACE_wrappers/contrib/FaCE/FaCE.mpc
+ dep/ACE_wrappers/contrib/FaCE/FaCE.rc
+ dep/ACE_wrappers/contrib/FaCE/FaCENOACE.mpc
+ dep/ACE_wrappers/contrib/FaCE/FaCE_OS.h
+ dep/ACE_wrappers/contrib/FaCE/License.txt
+ dep/ACE_wrappers/contrib/FaCE/Main.cpp
+ dep/ACE_wrappers/contrib/FaCE/README
+ dep/ACE_wrappers/contrib/FaCE/TAO.bmp
+ dep/ACE_wrappers/contrib/FaCE/newres.h
+ dep/ACE_wrappers/contrib/FaCE/resource.h
+ dep/ACE_wrappers/contrib/minizip/ChangeLogUnzip
+ dep/ACE_wrappers/contrib/minizip/crypt.h
+ dep/ACE_wrappers/contrib/minizip/ioapi.c
+ dep/ACE_wrappers/contrib/minizip/ioapi.h
+ dep/ACE_wrappers/contrib/minizip/miniunz.c
+ dep/ACE_wrappers/contrib/minizip/minizip.c
+ dep/ACE_wrappers/contrib/minizip/minizip.mpc
+ dep/ACE_wrappers/contrib/minizip/minizip.mwc
+ dep/ACE_wrappers/contrib/minizip/minizip_export.h
+ dep/ACE_wrappers/contrib/minizip/mztools.c
+ dep/ACE_wrappers/contrib/minizip/mztools.h
+ dep/ACE_wrappers/contrib/minizip/unzip.c
+ dep/ACE_wrappers/contrib/minizip/unzip.h
+ dep/ACE_wrappers/contrib/minizip/zip.c
+ dep/ACE_wrappers/contrib/minizip/zip.h
+ dep/ACE_wrappers/include/makeinclude/all_in_one.GNU
+ dep/ACE_wrappers/include/makeinclude/component_check.GNU
+ dep/ACE_wrappers/include/makeinclude/macros.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_aix.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_aix_g++.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_aix_ibm.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_cegcc.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_clang_common.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_cray.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_cygwin32.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_freebsd.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_g++_common.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_gnuwin32_common.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_hpux_aCC.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_hpux_gcc.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_integrity_ghs.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_linux.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_linux_common.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_linux_icc.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_linux_pgi.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_linux_suncc.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_lynxos.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_macosx.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_macosx_common.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_macosx_icc.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_macosx_iphone.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_macosx_leopard.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_macosx_panther.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_macosx_snowleopard.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_macosx_tiger.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_mingw32.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_mvs.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_netbsd.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_openbsd.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_openvms.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_qnx_neutrino.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_qnx_rtp_gcc.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_rtems.x_g++.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_sunos5_common.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_sunos5_g++.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_sunos5_sunc++.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_tandem.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_vxworks.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_vxworks5.5.x.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_vxworks6.2.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_vxworks6.3.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_vxworks6.4.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_vxworks6.5.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_vxworks6.6.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_vxworks6.7.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_vxworks6.8.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_win32_dmc.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_win32_icc.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_win32_interix.GNU
+ dep/ACE_wrappers/include/makeinclude/platform_win32_msvc.GNU
+ dep/ACE_wrappers/include/makeinclude/rules.bin.GNU
+ dep/ACE_wrappers/include/makeinclude/rules.common.GNU
+ dep/ACE_wrappers/include/makeinclude/rules.lib.GNU
+ dep/ACE_wrappers/include/makeinclude/rules.local.GNU
+ dep/ACE_wrappers/include/makeinclude/rules.nested.GNU
+ dep/ACE_wrappers/include/makeinclude/rules.nolocal.GNU
+ dep/ACE_wrappers/include/makeinclude/rules.nonested.GNU
+ dep/ACE_wrappers/include/makeinclude/wrapper_macros.GNU
+ dep/ACE_wrappers/lib/.empty
m dep/ACE_wrappers/m4/ace.m4
+ dep/ACE_wrappers/m4/libtool.m4
+ dep/ACE_wrappers/m4/ltoptions.m4
+ dep/ACE_wrappers/m4/ltsugar.m4
+ dep/ACE_wrappers/m4/ltversion.m4
+ dep/ACE_wrappers/m4/lt~obsolete.m4
m dep/CMakeLists.txt
- dep/include/Makefile.am
- dep/lib/Makefile.am
m dep/src/CMakeLists.txt
+ dep/src/g3dlite/CMakeLists.txt
- dep/src/g3dlite/Makefile.am
m dep/src/gsoap/CMakeLists.txt
- dep/src/gsoap/Makefile.am
m dep/src/zlib/CMakeLists.txt
- dep/src/zlib/Makefile.am
+ dep/tbb/CMakeLists.txt
+ dep/tbb/Makefile
- dep/tbb/Makefile.am
m dep/tbb/build/Makefile.tbb
m dep/tbb/build/common.inc
- dep/tbb/build/version_info_winlrb.js
+ dep/tbb/build/vs100project/index.html
+ dep/tbb/build/vs100project/makefile.sln
+ dep/tbb/build/vs100project/tbb.vcxproj
+ dep/tbb/build/vs100project/tbbmalloc.vcxproj
+ dep/tbb/build/vs100project/tbbmalloc_proxy.vcxproj
+ dep/tbb/build/vs100project/version_string.tmp
- dep/tbb/build/winlrb.cl.inc
- dep/tbb/build/winlrb.icc.inc
- dep/tbb/build/winlrb.inc
+ dep/tbb/src/perf/fibonacci_cutoff.cpp
+ dep/tbb/src/perf/fibonacci_impl_tbb.cpp
+ dep/tbb/src/perf/perf_util.h
+ dep/tbb/src/perf/statistics.cpp
+ dep/tbb/src/perf/statistics.h
+ dep/tbb/src/perf/statistics_xml.h
+ dep/tbb/src/perf/time_base.cpp
+ dep/tbb/src/perf/time_framework.h
+ dep/tbb/src/perf/time_hash_map.cpp
+ dep/tbb/src/perf/time_hash_map_fill.cpp
+ dep/tbb/src/perf/time_locked_work.cpp
+ dep/tbb/src/perf/time_sandbox.h
+ dep/tbb/src/perf/time_unit.cpp
+ dep/tbb/src/perf/time_vector.cpp
+ dep/tbb/src/rml/perfor/omp_nested.cpp
+ dep/tbb/src/rml/perfor/omp_simple.cpp
+ dep/tbb/src/rml/perfor/tbb_multi_omp.cpp
+ dep/tbb/src/rml/perfor/tbb_simple.cpp
+ dep/tbb/src/rml/perfor/thread_level.h
+ dep/tbb/src/rml/test/rml_omp_stub.cpp
+ dep/tbb/src/rml/test/test_job_automaton.cpp
+ dep/tbb/src/rml/test/test_rml_mixed.cpp
+ dep/tbb/src/rml/test/test_rml_omp.cpp
+ dep/tbb/src/rml/test/test_rml_omp_c_linkage.c
+ dep/tbb/src/rml/test/test_rml_tbb.cpp
+ dep/tbb/src/rml/test/test_server.h
+ dep/tbb/src/rml/test/test_thread_monitor.cpp
- dep/tbb/src/tbb/gate.h
m dep/tbb/src/tbb/private_server.cpp
m dep/tbb/src/tbb/tbb_version.h
m dep/tbb/src/tbbmalloc/tbbmalloc.rc
- doc/Makefile.am
- m4/ax_check_openssl.m4
- m4/pkg.m4
- sql/Makefile.am
m sql/mangos.sql
- sql/tools/Makefile.am
+ sql/updates/11169_01_mangos_mangos_string.sql
+ sql/updates/11169_02_mangos_command.sql
- sql/updates/Makefile.am
+ src/CMakeLists.txt
m src/bindings/CMakeLists.txt
+ src/bindings/universal/CMakeLists.txt
- src/bindings/universal/Makefile.am
+ src/framework/CMakeLists.txt
- src/framework/Makefile.am
m src/game/AchievementMgr.cpp
m src/game/AchievementMgr.h
+ src/game/CMakeLists.txt
m src/game/CharacterHandler.cpp
m src/game/Chat.cpp
m src/game/Chat.h
m src/game/Creature.cpp
m src/game/Creature.h
m src/game/DBCEnums.h
m src/game/GameEventMgr.cpp
m src/game/GameEventMgr.h
m src/game/GameObject.cpp
m src/game/GameObject.h
m src/game/Language.h
m src/game/Level2.cpp
- src/game/Makefile.am
m src/game/MapPersistentStateMgr.cpp
m src/game/MapPersistentStateMgr.h
m src/game/ObjectGuid.h
m src/game/ObjectMgr.cpp
m src/game/Player.cpp
m src/game/Player.h
m src/game/PoolManager.cpp
m src/game/PoolManager.h
m src/game/SpellEffects.cpp
m src/game/World.cpp
m src/game/World.h
- src/game/vmap/Makefile.am
+ src/mangosd/CMakeLists.txt
- src/mangosd/Makefile.am
m src/mangosd/mangosd.conf.dist.in
+ src/realmd/CMakeLists.txt
- src/realmd/Makefile.am
- src/shared/Auth/Makefile.am
+ src/shared/CMakeLists.txt
- src/shared/Config/Makefile.am
- src/shared/Database/Makefile.am
- src/shared/Makefile.am
m src/shared/Util.h
m src/shared/revision_nr.h
m src/shared/revision_sql.h
- src/tools/genrevision/Makefile.am
m win/VC100/tbb.vcxproj
m win/VC80/mangosd.vcproj
m win/VC80/tbb.vcproj
m win/VC80/tbbmalloc.vcproj
m win/VC90/tbb.vcproj
m win/VC90/tbbmalloc.vcproj
</pre>
<pre style='white-space:pre-wrap;width:81ex'>Merge commit '6800ccd52332276ab167dfa693f4e18953946257' into 400</pre>




Дальше...