summaryrefslogtreecommitdiff
path: root/cpp/test/IceGrid/replication
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2016-03-17 11:44:37 -0400
committerJoe George <joe@zeroc.com>2016-03-17 11:44:37 -0400
commitdb1006f76622d1dd995bc1e2c1fc761c6ac7d7c2 (patch)
tree3c05d7f841a1585360d0a6450748fd6dc26b050c /cpp/test/IceGrid/replication
parentfixing .gitignore in checksum test (diff)
parentUpdate Ice Builder for Gradle version to 1.2.1 (diff)
downloadice-db1006f76622d1dd995bc1e2c1fc761c6ac7d7c2.tar.bz2
ice-db1006f76622d1dd995bc1e2c1fc761c6ac7d7c2.tar.xz
ice-db1006f76622d1dd995bc1e2c1fc761c6ac7d7c2.zip
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/test/IceGrid/replication')
-rw-r--r--cpp/test/IceGrid/replication/.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/test/IceGrid/replication/.gitignore b/cpp/test/IceGrid/replication/.gitignore
index 06dd9d3bfba..a2fb0ecc07c 100644
--- a/cpp/test/IceGrid/replication/.gitignore
+++ b/cpp/test/IceGrid/replication/.gitignore
@@ -1,8 +1,10 @@
// Generated by makegitignore.py
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
+.depend
client
server
+.depend
Test.cpp
Test.h
build.txt