diff options
| author | Siqi LIU <me@siqi.fr> | 2013-07-30 23:28:50 +0200 |
|---|---|---|
| committer | Siqi LIU <me@siqi.fr> | 2013-07-30 23:28:50 +0200 |
| commit | a024948a5d00f19e97c5574ba173ee8851ab4536 (patch) | |
| tree | 631f0ab65ed13b1377052c529d182196b702bdcb /setup_native | |
| parent | f0326d3249c2e461489877e2d39673ad8968320a (diff) | |
resolve conflicts
Change-Id: If0a7146f51741e3e8250f0aa671a6902119bb6eb
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/source/mac/ooo/DS_Store | bin | 15364 -> 0 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/setup_native/source/mac/ooo/DS_Store b/setup_native/source/mac/ooo/DS_Store Binary files differdeleted file mode 100644 index fec0edc61bc5..000000000000 --- a/setup_native/source/mac/ooo/DS_Store +++ /dev/null |