diff options
| author | Erik Sohns <eriksohns@123mail.org> | 2016-07-14 12:12:06 +0200 |
|---|---|---|
| committer | Erik Sohns <eriksohns@123mail.org> | 2016-07-14 12:12:06 +0200 |
| commit | 7ad5360d3ba1a0fece841d5d583b673337cdd6ff (patch) | |
| tree | 2b1ea83ce7dd54d37138a04fef339b75f2af6504 /.gitignore | |
| parent | 219ae584c43856583338728bbe27a045191f70ae (diff) | |
| parent | 5a73436c7271d77797ab9694224c39c344d80bf4 (diff) | |
| download | ATCD-7ad5360d3ba1a0fece841d5d583b673337cdd6ff.tar.gz | |
Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO
# Conflicts:
# ACE/protocols/ace/HTBP/HTBP_Channel.cpp
# ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
# ACE/protocols/ace/HTBP/HTBP_Session.cpp
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index a4b0d7f9a13..6eed410f3aa 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,12 @@ *.sdf *.sln *.suo +*S_T.cpp +*S_T.h +*S_T.inl + +*.iobj +*.ipdb .depend.* GNUmakefile* @@ -30,3 +36,9 @@ ipch/ /setenv.cmd /setenv.sh /build + +*.o +*.res +*.opendb +*.VC.db +build |