Author: shuston Date: Tue Nov 16 15:04:02 2010 New Revision: 1035652 URL: http://svn.apache.org/viewvc?rev=1035652&view=rev Log: Merged in QPID-2948 from trunk r1035509.
Modified: qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/ (props changed) qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/developer.doxygen.in qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/user.doxygen.in Propchange: qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Nov 16 15:04:02 2010 @@ -0,0 +1,5 @@ +/qpid/branches/0.5.x-dev/qpid/cpp/docs/api:892761,894875 +/qpid/branches/0.6-release-windows-installer/cpp/docs/api:926803 +/qpid/branches/0.6-release-windows-installer/qpid/cpp/docs/api:926803,927233 +/qpid/branches/java-network-refactor/qpid/cpp/docs/api:805429-825319 +/qpid/trunk/qpid/cpp/docs/api:1035509 Modified: qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/developer.doxygen.in URL: http://svn.apache.org/viewvc/qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/developer.doxygen.in?rev=1035652&r1=1035651&r2=1035652&view=diff ============================================================================== --- qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/developer.doxygen.in (original) +++ qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/developer.doxygen.in Tue Nov 16 15:04:02 2010 @@ -1029,7 +1029,7 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = QPID_CLIENT_EXTERN= QPID_COMMON_EXTERN= QPID_CONSOLE_EXTERN= QPID_BROKER_EXTERN= +PREDEFINED = QPID_CLIENT_EXTERN= QPID_COMMON_EXTERN= QPID_CONSOLE_EXTERN= QPID_BROKER_EXTERN= QPID_MESSAGING_EXTERN= QMF_EXTERN= # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. Modified: qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/user.doxygen.in URL: http://svn.apache.org/viewvc/qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/user.doxygen.in?rev=1035652&r1=1035651&r2=1035652&view=diff ============================================================================== --- qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/user.doxygen.in (original) +++ qpid/branches/0.8-release-candidates/qpid/cpp/docs/api/user.doxygen.in Tue Nov 16 15:04:02 2010 @@ -1021,7 +1021,7 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = QPID_CLIENT_EXTERN= QPID_COMMON_EXTERN= QPID_CONSOLE_EXTERN= QPID_BROKER_EXTERN= +PREDEFINED = QPID_CLIENT_EXTERN= QPID_COMMON_EXTERN= QPID_CONSOLE_EXTERN= QPID_BROKER_EXTERN= QPID_MESSAGING_EXTERN= QMF_EXTERN= # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org