diff options
| author | Joe George <joe@zeroc.com> | 2016-03-17 11:44:37 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-03-17 11:44:37 -0400 |
| commit | db1006f76622d1dd995bc1e2c1fc761c6ac7d7c2 (patch) | |
| tree | 3c05d7f841a1585360d0a6450748fd6dc26b050c /cpp/test/IceStorm | |
| parent | fixing .gitignore in checksum test (diff) | |
| parent | Update Ice Builder for Gradle version to 1.2.1 (diff) | |
| download | ice-db1006f76622d1dd995bc1e2c1fc761c6ac7d7c2.tar.bz2 ice-db1006f76622d1dd995bc1e2c1fc761c6ac7d7c2.tar.xz ice-db1006f76622d1dd995bc1e2c1fc761c6ac7d7c2.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/test/IceStorm')
| -rw-r--r-- | cpp/test/IceStorm/federation/.gitignore | 2 | ||||
| -rw-r--r-- | cpp/test/IceStorm/federation2/.gitignore | 2 | ||||
| -rw-r--r-- | cpp/test/IceStorm/rep1/.gitignore | 2 | ||||
| -rw-r--r-- | cpp/test/IceStorm/repgrid/.gitignore | 2 | ||||
| -rw-r--r-- | cpp/test/IceStorm/repstress/.gitignore | 2 | ||||
| -rw-r--r-- | cpp/test/IceStorm/single/.gitignore | 2 | ||||
| -rw-r--r-- | cpp/test/IceStorm/stress/.gitignore | 2 |
7 files changed, 14 insertions, 0 deletions
diff --git a/cpp/test/IceStorm/federation/.gitignore b/cpp/test/IceStorm/federation/.gitignore index f6811ab9123..9f3e354edb6 100644 --- a/cpp/test/IceStorm/federation/.gitignore +++ b/cpp/test/IceStorm/federation/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend publisher subscriber +.depend Event.cpp Event.h build.txt diff --git a/cpp/test/IceStorm/federation2/.gitignore b/cpp/test/IceStorm/federation2/.gitignore index 1e15a552882..1ee63744e74 100644 --- a/cpp/test/IceStorm/federation2/.gitignore +++ b/cpp/test/IceStorm/federation2/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend publisher subscriber +.depend Event.cpp Event.h build.txt diff --git a/cpp/test/IceStorm/rep1/.gitignore b/cpp/test/IceStorm/rep1/.gitignore index a6eaee14920..9cd9b7ec547 100644 --- a/cpp/test/IceStorm/rep1/.gitignore +++ b/cpp/test/IceStorm/rep1/.gitignore @@ -1,9 +1,11 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend publisher subscriber sub +.depend Single.cpp Single.h build.txt diff --git a/cpp/test/IceStorm/repgrid/.gitignore b/cpp/test/IceStorm/repgrid/.gitignore index 34ee77907e3..6c0d77be0e0 100644 --- a/cpp/test/IceStorm/repgrid/.gitignore +++ b/cpp/test/IceStorm/repgrid/.gitignore @@ -1,7 +1,9 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend client +.depend Single.cpp Single.h build.txt diff --git a/cpp/test/IceStorm/repstress/.gitignore b/cpp/test/IceStorm/repstress/.gitignore index 3326cff4756..c1e2c6ba18a 100644 --- a/cpp/test/IceStorm/repstress/.gitignore +++ b/cpp/test/IceStorm/repstress/.gitignore @@ -1,9 +1,11 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend publisher subscriber control +.depend Single.cpp Controller.cpp Single.h diff --git a/cpp/test/IceStorm/single/.gitignore b/cpp/test/IceStorm/single/.gitignore index 9d7c0709185..7245563774f 100644 --- a/cpp/test/IceStorm/single/.gitignore +++ b/cpp/test/IceStorm/single/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend publisher subscriber +.depend Single.cpp Single.h build.txt diff --git a/cpp/test/IceStorm/stress/.gitignore b/cpp/test/IceStorm/stress/.gitignore index 1e15a552882..1ee63744e74 100644 --- a/cpp/test/IceStorm/stress/.gitignore +++ b/cpp/test/IceStorm/stress/.gitignore @@ -1,8 +1,10 @@ // Generated by makegitignore.py // IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend publisher subscriber +.depend Event.cpp Event.h build.txt |