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/src/slice2confluence | |
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/src/slice2confluence')
-rw-r--r-- | cpp/src/slice2confluence/.gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cpp/src/slice2confluence/.gitignore b/cpp/src/slice2confluence/.gitignore new file mode 100644 index 00000000000..3a412ca89c7 --- /dev/null +++ b/cpp/src/slice2confluence/.gitignore @@ -0,0 +1,4 @@ +// Generated by makegitignore.py + +// IMPORTANT: Do not edit this file -- any edits made here will be lost! +.depend |