diff options
| author | kremlin- <ian@kremlin.cc> | 2014-06-26 10:16:18 +0800 |
|---|---|---|
| committer | kremlin- <ian@kremlin.cc> | 2014-06-26 10:16:18 +0800 |
| commit | e37568761299fe5228c88187dfc691330cf09f9d (patch) | |
| tree | 60ed7972e3274d96ca4e29a971e3af855c800496 /.gitignore | |
| parent | 94304e786b09589046e9ac4e38e2dffca29564b4 (diff) | |
| download | systembsd-e37568761299fe5228c88187dfc691330cf09f9d.tar systembsd-e37568761299fe5228c88187dfc691330cf09f9d.tar.gz systembsd-e37568761299fe5228c88187dfc691330cf09f9d.tar.bz2 systembsd-e37568761299fe5228c88187dfc691330cf09f9d.tar.lz systembsd-e37568761299fe5228c88187dfc691330cf09f9d.tar.xz systembsd-e37568761299fe5228c88187dfc691330cf09f9d.tar.zst systembsd-e37568761299fe5228c88187dfc691330cf09f9d.zip | |
fix up merge conflicts to compile on strict settings
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions