Merge branch 'move_public_h_to_include' into trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@794325 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 32 deletions

diff --git a/.gitignore b/.gitignore
index 310bbe6906..b255259f91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 *.o
 *.la
 *.lo
+*.vglog
 .dirstamp
 Makefile*
 config\.*
@@ -12,35 +13,6 @@ configure
 .deps
 .libs
 autom4te.cache
-qpid/cpp/examples/direct/declare_queues
-qpid/cpp/examples/direct/direct_producer
-qpid/cpp/examples/direct/listener
-qpid/cpp/examples/failover/declare_queues
-qpid/cpp/examples/failover/replaying_sender
-qpid/cpp/examples/failover/resuming_receiver
-qpid/cpp/examples/qmf-console/console
-qpid/cpp/examples/qmf-console/ping
-qpid/cpp/examples/qmf-console/printevents
-qpid/cpp/examples/fanout/fanout_producer
-qpid/cpp/examples/fanout/listener
-qpid/cpp/examples/pub-sub/topic_listener
-qpid/cpp/examples/pub-sub/topic_publisher
-qpid/cpp/examples/request-response/client
-qpid/cpp/examples/request-response/server
-qpid/cpp/src/tests/client_test
-qpid/cpp/src/tests/consume
-qpid/cpp/src/tests/latencytest
-qpid/cpp/src/tests/perftest
-qpid/cpp/src/tests/publish
-qpid/cpp/src/tests/qpidd.log
-qpid/cpp/src/tests/qpidd.port
-qpid/cpp/src/tests/topic_listener
-qpid/cpp/src/tests/topic_publisher
-qpid/cpp/src/tests/txtest
-qpid/cpp/src/tests/unit_test
-qpid/cpp/src/boost
-qpid/cpp/src/generate_MaxMethodBodySize_h
-qpid/cpp/src/stamp-h1
 aclocal.m4
 developer.doxygen
 user.doxygen
@@ -49,9 +21,7 @@ qpid/cpp/libtool
 qpidc.spec
 qpid/cpp/src/gen/
 *.mk
-mgen.timestamp
-MaxMethodBodySize.h
-qpidd
+*.timestamp
 rgen.timestamp
 *.pcl
 qpid/cpp/managementgen/management-types.xml