Merge branch 'master' into tabs-studio
Description
Description
Details
Details
- Committed
GitHub <noreply@github.com> Jun 10 2017, 19:58 - Pushed
aubort Jul 2 2018, 16:12 - Parents
- rGITIGNORE2a2e34e6fcac: Merge pull request #2411 from AmadeusW/amadeusw/benchmarkdotnet
rGITIGNOREf50f39c3a2de: Add Tabs Studio files to VisualStudui.gitignore - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 2a2e34e6fcac | Brendan Forster/GitHub | Merge pull request #2411 from AmadeusW/amadeusw/benchmarkdotnet | Jun 9 2017 | |||
| 466b5f992d7b | Amadeusz Wieczorek | Adds BenchmarkDotNet.Artifacts to VisualStudio.gitignore | Jun 9 2017 | |||
| 9f847e585916 | Brendan Forster/GitHub | Merge pull request #2407 from utkonos/master | Jun 6 2017 | |||
| ed9f8139c196 | Robert Simmons | Optionally add log files to Vagrant and improve file's comments | Jun 6 2017 | |||
| 7af8eea00b37 | Brendan Forster/GitHub | Merge pull request #2401 from utkonos/master | May 31 2017 | |||
| 9322d165f36c | Robert Simmons | Fix capitalization and spacing of comments | May 31 2017 | |||
| 30e75b6caa9e | Brendan Forster/GitHub | Merge pull request #2395 from iKeirNez/jenv | May 30 2017 | |||
| 5105ed3af676 | Keir Nellyer/GitHub | Create .gitignore rules for JEnv | May 26 2017 | |||
| 5d896f6791c4 | Brendan Forster/GitHub | Merge pull request #2389 from KoynovStas/Qt_UnitTests | May 22 2017 | |||
| 6c2a70d728b4 | Brendan Forster/GitHub | Merge pull request #2391 from jwg4/patch-1 | May 22 2017 | |||
| 252058ed8e0c | jwg4/GitHub | Consolidate all environments in one section | May 22 2017 | |||
| 91ae97083c20 | KoynovStas | add object_script to Qt.gitignore | May 21 2017 | |||
| ab1e4933925c | KoynovStas | add target_wrapper.* to Qt.gitignore | May 21 2017 | |||
| 67f633a0df0f | Brendan Forster/GitHub | Merge pull request #2388 from KoynovStas/Static_QT | May 21 2017 | |||
| c65c993f4d5f | KoynovStas | add *_plugin_import.cpp to Qt.gitignore | May 20 2017 | |||
| dae624c7d46b | Brendan Forster/GitHub | Merge pull request #2374 from julienshepherd/master | May 20 2017 | |||
| 48c2b4f889a8 | julienshepherd/GitHub | Update VisualStudio.gitignore | May 17 2017 | |||
| 9a3dea464936 | Brendan Forster/GitHub | Merge pull request #2383 from shiftkey/patch-1 | May 15 2017 | |||
| 699b4a4f33b9 | Brendan Forster/GitHub | ensure the following ! rules are included | May 15 2017 | |||
| 44cbb3686c18 | Brendan Forster/GitHub | Merge pull request #2379 from scari/master | May 12 2017 | |||
| cb129a174f3f | Younggun Kim | Fixed typo | May 12 2017 | |||
| 0a37e32c1d99 | Brendan Forster/GitHub | Merge pull request #2375 from vuolter/patch-1 | May 10 2017 | |||
| 0618721661c9 | Walter Purcaro/GitHub | Add stackdump to Windows.gitignore | May 10 2017 | |||
| 841a40d93b34 | julienshepherd/GitHub | add .appx to VisualStudio.gitignore | May 9 2017 | |||
| df6a05e29979 | Brendan Forster/GitHub | Merge pull request #2371 from brettcannon/patch-1 | May 7 2017 | |||
| 58c2abab2c6f | Brett Cannon/GitHub | Ignore mypy's cache directory | May 6 2017 | |||
| c0c1a480a906 | Brendan Forster/GitHub | Merge pull request #2359 from Glordim/master | Apr 24 2017 | |||
| 8508edef79f3 | Glordim | Add moc_*.h in Qt.gitignore | Apr 23 2017 | |||
| f1eba3434761 | Brendan Forster/GitHub | Merge pull request #2356 from orzechow/microsoft-visio | Apr 20 2017 | |||
| 433d912914e4 | Piotr Orzechowski | Edit ignore for Microsoft Visio autosave files to include Office <= 2003 | Apr 19 2017 | |||
| 01c81930bf32 | Brendan Forster/GitHub | Merge pull request #2354 from mkakodkar/patch-1 | Apr 17 2017 | |||
| 846064b2b027 | Mayank Kakodkar/GitHub | Added .tgz | Apr 16 2017 | |||
| d4d2c86ccc0f | Brendan Forster/GitHub | Merge pull request #2315 from ehannes/fix-magento-sub-dir-exclude | Apr 15 2017 | |||
| 69592e260a8e | Brendan Forster/GitHub | Merge pull request #2316 from gagallo7/patch-1 | Apr 15 2017 | |||
| 59432254daa5 | Brendan Forster/GitHub | Merge pull request #2329 from Omarasifshaikh/patch-1 | Apr 15 2017 | |||
| 0a383b332e4d | Brendan Forster/GitHub | Merge pull request #2330 from random82/patch-1 | Apr 15 2017 | |||
| f57304e97628 | Brendan Forster/GitHub | Merge pull request #2162 from chaosdefinition/chaosdefinition-patch-1 | Apr 4 2017 | |||
| 8a4f5f51587d | Brendan Forster/GitHub | Merge pull request #2344 from orzechow/tex-pdfpc | Apr 3 2017 | |||
| 2e58c0210950 | Brendan Forster/GitHub | Merge pull request #2343 from ghisvail/patch-1 | Apr 3 2017 | |||
| a5a3ccd7c212 | Ghislain Antony Vaillant/GitHub | Exclude the root site folder only | Apr 1 2017 | |||
| 1b5fb77c1c8d | Piotr Orzechowski/GitHub | Add pdfpc files to Tex.gitignore | Mar 31 2017 | |||
| 3292124f0614 | Ghislain Antony Vaillant/GitHub | Ignore mkdocs site directory | Mar 31 2017 | |||
| 20cd38579441 | Brendan Forster/GitHub | Merge pull request #2337 from spencermathews/fix-macos-icon | Mar 29 2017 | |||
| 978c9be98cb5 | Brendan Forster/GitHub | Merge pull request #2336 from raeglan/patch-1 | Mar 28 2017 | |||
| c02a4743f9c6 | Spencer Mathews | Add two CR characters to ignore Icon? | Mar 28 2017 | |||
| d0d432aa8d85 | Spencer Mathews | Change macOS to UNIX line endings | Mar 28 2017 | |||
| 0674ff5b5c77 | Rafael Miranda/GitHub | .project and .classpath should be inside VC | Mar 28 2017 | |||
| 2c0cb52a6792 | Brendan Forster/GitHub | Merge pull request #2331 from cptaffe/master | Mar 23 2017 | |||
| 811b3a6998a2 | Connor Taffe | Double-asterisk misuse | Mar 23 2017 | |||
| cae82a19fbb3 | Dominik Raniszewski/GitHub | Added .spyproject to ignored paths | Mar 21 2017 |