diff options
| author | Jb Evain <jb@evain.net> | 2015-04-25 14:52:23 +0300 |
|---|---|---|
| committer | Jb Evain <jb@evain.net> | 2015-04-25 14:52:23 +0300 |
| commit | 73bd4f2fc18d332ee13f895bcc6f5c792f253527 (patch) | |
| tree | e8aaf4b1d58b7a97a48ff81f5bb7d9ed0e6227af /.gitignore | |
| parent | 1472815cc068c4264a75a8667da784783a989c0e (diff) | |
| parent | 7159774d52f0f28d5bd4731bba1ee65e44167dfc (diff) | |
Merge branch 'master' into lowermemuse
Conflicts:
Mono.Cecil.PE/Image.cs
Mono.Cecil/DefaultAssemblyResolver.cs
Mono.Cecil/ModuleDefinition.cs
Test/Mono.Cecil.Tests/Addin.cs
Test/Mono.Cecil.Tests/ImageReadTests.cs
Test/Mono.Cecil.Tests/ImportCecilTests.cs
Test/Mono.Cecil.Tests/ImportReflectionTests.cs
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -8,3 +8,4 @@ obj *.nupkg **/test-results/* *Resharper* +Mono.Cecil.sln.ide* |