aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJie Luo <anandolee@gmail.com>2015-05-14 14:54:36 -0700
committerJie Luo <anandolee@gmail.com>2015-05-14 14:54:36 -0700
commitaa8c951ef58dbc6a5c1ec8118980938f20916ce8 (patch)
tree07075ec40b4ebb013bd2f12c82d2f7f0c47b7b1b /.gitignore
parentb481a4f920d2f5872bc1e9bfd6b0656f6ad0b713 (diff)
parent2d9b1c592ff7319ee9d6520c9df4838087522e05 (diff)
downloadprotobuf-aa8c951ef58dbc6a5c1ec8118980938f20916ce8.tar.gz
protobuf-aa8c951ef58dbc6a5c1ec8118980938f20916ce8.tar.bz2
protobuf-aa8c951ef58dbc6a5c1ec8118980938f20916ce8.zip
Merge pull request #384 from google/csharp
Merge protobuf C# into master (only C# proto2 is supported)
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore8
1 files changed, 8 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index f1572858..6508eccb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,6 +76,14 @@ src/**/*.trs
java/target
javanano/target
+# Windows native output.
+vsprojects/Debug
+vsprojects/Release
+
+# NuGet packages: we want the repository configuration, but not the
+# packages themselves.
+/csharp/src/packages/*/
+
# Directories created by opening the Objective C Xcode projects.
objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcuserdata/
objectivec/ProtocolBuffers_OSX.xcodeproj/xcuserdata/