summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2014-05-02 19:03:35 +0200
committerJose <jose@zeroc.com>2014-05-02 19:03:35 +0200
commit26850f5440d2cf0a3328751b01ece8712f9b5281 (patch)
tree9342ed62c6febf9987bd8e831538ea313b25a904
parentUpdate depend files. (diff)
downloadice-26850f5440d2cf0a3328751b01ece8712f9b5281.tar.bz2
ice-26850f5440d2cf0a3328751b01ece8712f9b5281.tar.xz
ice-26850f5440d2cf0a3328751b01ece8712f9b5281.zip
Update .gitignore files
-rw-r--r--cpp/demo/Ice/converter/.gitignore3
-rw-r--r--cpp/demo/IceDiscovery/replication/.gitignore5
-rw-r--r--cpp/src/IceDiscovery/.gitignore4
-rw-r--r--cpp/test/Ice/stringConverter/.gitignore1
-rw-r--r--cpp/test/IceGrid/replicaGroup/.gitignore1
5 files changed, 6 insertions, 8 deletions
diff --git a/cpp/demo/Ice/converter/.gitignore b/cpp/demo/Ice/converter/.gitignore
index 71552821ce7..04f26b01a66 100644
--- a/cpp/demo/Ice/converter/.gitignore
+++ b/cpp/demo/Ice/converter/.gitignore
@@ -1,7 +1,8 @@
// Generated by makegitignore.py
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-client
+client1
+client2
server
Greet.cpp
Greet.h
diff --git a/cpp/demo/IceDiscovery/replication/.gitignore b/cpp/demo/IceDiscovery/replication/.gitignore
index b3dfc7b5b42..9f5c1b1b66e 100644
--- a/cpp/demo/IceDiscovery/replication/.gitignore
+++ b/cpp/demo/IceDiscovery/replication/.gitignore
@@ -5,8 +5,3 @@ client
server
Hello.cpp
Hello.h
-db/master/*
-db/node1/*
-db/node2/*
-db/replica1/*
-db/replica2/*
diff --git a/cpp/src/IceDiscovery/.gitignore b/cpp/src/IceDiscovery/.gitignore
index 9f2f43691cc..7ba1aabfc02 100644
--- a/cpp/src/IceDiscovery/.gitignore
+++ b/cpp/src/IceDiscovery/.gitignore
@@ -1,5 +1,5 @@
// Generated by makegitignore.py
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-Internal.cpp
-Internal.h
+IceDiscovery.cpp
+IceDiscovery.h
diff --git a/cpp/test/Ice/stringConverter/.gitignore b/cpp/test/Ice/stringConverter/.gitignore
index 505a9066685..67872faa673 100644
--- a/cpp/test/Ice/stringConverter/.gitignore
+++ b/cpp/test/Ice/stringConverter/.gitignore
@@ -2,5 +2,6 @@
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
client
+server
Test.cpp
Test.h
diff --git a/cpp/test/IceGrid/replicaGroup/.gitignore b/cpp/test/IceGrid/replicaGroup/.gitignore
index 06dd9d3bfba..6c64605ce39 100644
--- a/cpp/test/IceGrid/replicaGroup/.gitignore
+++ b/cpp/test/IceGrid/replicaGroup/.gitignore
@@ -3,6 +3,7 @@
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
client
server
+libTestService.*
Test.cpp
Test.h
build.txt