summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2007-06-08 15:53:37 +0800
committerMatthew Newhook <matthew@zeroc.com>2007-06-08 15:53:37 +0800
commitbc8fd6a01ca952d67a9b37ad6e4b89a4082ca5ed (patch)
tree1df97b17b7907ee3bd9ca6490224c79e84489d72 /cpp
parentmore .gitignore files. (diff)
parentmore clean stuff (diff)
downloadice-bc8fd6a01ca952d67a9b37ad6e4b89a4082ca5ed.tar.bz2
ice-bc8fd6a01ca952d67a9b37ad6e4b89a4082ca5ed.tar.xz
ice-bc8fd6a01ca952d67a9b37ad6e4b89a4082ca5ed.zip
Merge branch 'master' of ssh://cvs.zeroc.com/home/matthew/ice2
Diffstat (limited to 'cpp')
-rw-r--r--cpp/test/IceStorm/federation/.gitignore1
-rw-r--r--cpp/test/IceStorm/federation2/.gitignore1
2 files changed, 2 insertions, 0 deletions
diff --git a/cpp/test/IceStorm/federation/.gitignore b/cpp/test/IceStorm/federation/.gitignore
index dcd55d76efa..1ac307f15b1 100644
--- a/cpp/test/IceStorm/federation/.gitignore
+++ b/cpp/test/IceStorm/federation/.gitignore
@@ -2,3 +2,4 @@ publisher
subscriber
Event.cpp
Event.h
+build.txt
diff --git a/cpp/test/IceStorm/federation2/.gitignore b/cpp/test/IceStorm/federation2/.gitignore
index dcd55d76efa..1ac307f15b1 100644
--- a/cpp/test/IceStorm/federation2/.gitignore
+++ b/cpp/test/IceStorm/federation2/.gitignore
@@ -2,3 +2,4 @@ publisher
subscriber
Event.cpp
Event.h
+build.txt