summaryrefslogtreecommitdiff
path: root/objective-c
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2015-03-26 13:36:56 -0230
committerDwayne Boone <dwayne@zeroc.com>2015-03-26 13:36:56 -0230
commit849f73806d3a17d7e52770afbec0232debc0c24a (patch)
treec6b966d980ecf09e8328eaa36caa29c8d5a21d1a /objective-c
parentReformatted README (diff)
downloadice-849f73806d3a17d7e52770afbec0232debc0c24a.tar.bz2
ice-849f73806d3a17d7e52770afbec0232debc0c24a.tar.xz
ice-849f73806d3a17d7e52770afbec0232debc0c24a.zip
Updated .gitignore files
Diffstat (limited to 'objective-c')
-rw-r--r--objective-c/include/objc/IceGrid/.gitignore1
-rw-r--r--objective-c/src/IceGrid/.gitignore2
-rw-r--r--objective-c/test/Ice/faultTolerance/.gitignore4
-rw-r--r--objective-c/test/Ice/servantLocator/.gitignore2
4 files changed, 3 insertions, 6 deletions
diff --git a/objective-c/include/objc/IceGrid/.gitignore b/objective-c/include/objc/IceGrid/.gitignore
index 41f5d685b02..9d13a816fbf 100644
--- a/objective-c/include/objc/IceGrid/.gitignore
+++ b/objective-c/include/objc/IceGrid/.gitignore
@@ -3,7 +3,6 @@
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
Admin.h
Descriptor.h
-Discovery.h
Exception.h
FileParser.h
Locator.h
diff --git a/objective-c/src/IceGrid/.gitignore b/objective-c/src/IceGrid/.gitignore
index 1d8a22c0997..5ed0ac9fde0 100644
--- a/objective-c/src/IceGrid/.gitignore
+++ b/objective-c/src/IceGrid/.gitignore
@@ -4,7 +4,6 @@
.depend
Admin.m
Descriptor.m
-Discovery.m
Exception.m
FileParser.m
Locator.m
@@ -16,7 +15,6 @@ Session.m
UserAccountMapper.m
Admin.h
Descriptor.h
-Discovery.h
Exception.h
FileParser.h
Locator.h
diff --git a/objective-c/test/Ice/faultTolerance/.gitignore b/objective-c/test/Ice/faultTolerance/.gitignore
index aa38efcc5dc..17e70af0964 100644
--- a/objective-c/test/Ice/faultTolerance/.gitignore
+++ b/objective-c/test/Ice/faultTolerance/.gitignore
@@ -4,5 +4,5 @@
client
server
.depend
-Test.m
-Test.h
+FaultToleranceTest.m
+FaultToleranceTest.h
diff --git a/objective-c/test/Ice/servantLocator/.gitignore b/objective-c/test/Ice/servantLocator/.gitignore
index 1dedfd23f4d..e092f9d23a4 100644
--- a/objective-c/test/Ice/servantLocator/.gitignore
+++ b/objective-c/test/Ice/servantLocator/.gitignore
@@ -2,8 +2,8 @@
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
client
-collocated
server
+collocated
.depend
ServantLocatorTest.m
ServantLocatorTest.h