diff options
| author | ArnoldZokas <arnold.zokas@coderoom.net> | 2010-11-22 22:13:59 +0000 |
|---|---|---|
| committer | ArnoldZokas <arnold.zokas@coderoom.net> | 2010-11-22 22:13:59 +0000 |
| commit | 64580d092f1d30328416b3836576fd25b82e5318 (patch) | |
| tree | c08de5e5a1f1d7ecb1fc10b6edc26c6a7dafa243 /.gitignore | |
| parent | a695dfaa5a0dd60d818bd70f1798c651661cba43 (diff) | |
| parent | 57599ef16daeda48381711dae1600cf0c467689d (diff) | |
| download | protobuf-64580d092f1d30328416b3836576fd25b82e5318.tar.gz protobuf-64580d092f1d30328416b3836576fd25b82e5318.tar.bz2 protobuf-64580d092f1d30328416b3836576fd25b82e5318.zip | |
Fixed merge conflicts
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -5,6 +5,7 @@ src/AddressBook/bin src/AddressBook/obj src/ProtocolBuffers/bin/ src/ProtocolBuffers/obj/ +src/ProtocolBuffers/objCF src/ProtocolBuffers.Test/bin/ src/ProtocolBuffers.Test/obj/ src/ProtoBench/bin/ |