diff options
| author | Alexey Gruzdev <alex.gruzdev@hotmail.com> | 2018-04-30 19:31:00 +0100 |
|---|---|---|
| committer | Alexey Gruzdev <alex.gruzdev@hotmail.com> | 2018-04-30 19:31:00 +0100 |
| commit | c72e6326dd4df3096144fe5cd510dc525ec39c9a (patch) | |
| tree | 60b0d79153a484f6879ac4cf53d31c01950d1b5d /.gitignore | |
| parent | 5897e96f9328584177fe9c13ce6b2db64d089962 (diff) | |
| parent | a9d989ec056246ea320a56ca7d02b161a6fee387 (diff) | |
| download | vcpkg-c72e6326dd4df3096144fe5cd510dc525ec39c9a.tar.gz vcpkg-c72e6326dd4df3096144fe5cd510dc525ec39c9a.zip | |
Merge remote-tracking branch 'remotes/origin/master' into dev/agruzdev/yato
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index d105fd368..aa272483c 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ bld/ [Bb]in/ [Oo]bj/ [Ll]og/ +vcpkg # Visual Studio 2015 cache/options directory .vs/ @@ -299,4 +300,4 @@ triplets/* ############################################################ # vcpkg - End -############################################################
\ No newline at end of file +############################################################ |