diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-08-27 10:33:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-08-27 10:33:24 -0400 |
| commit | 7795f42e4be2d04d3f40e227a094dbdce533b173 (patch) | |
| tree | 9814500ff44228fb0ffa896c11f86d8b05140b3f /src/win32 | |
| parent | b3b4f319367e1fb50ea99ba042ed60030e909c12 (diff) | |
| parent | 09d90b1b65066e79dc6de59f2ffca9e28ab5e7ea (diff) | |
| download | tor-7795f42e4be2d04d3f40e227a094dbdce533b173.tar tor-7795f42e4be2d04d3f40e227a094dbdce533b173.tar.gz | |
Merge branch 'bug6524_nm'
Diffstat (limited to 'src/win32')
| -rw-r--r-- | src/win32/Makefile.am | 3 | ||||
| -rw-r--r-- | src/win32/include.am | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/win32/Makefile.am b/src/win32/Makefile.am deleted file mode 100644 index 7f5d74248..000000000 --- a/src/win32/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ - -EXTRA_DIST = orconfig.h - diff --git a/src/win32/include.am b/src/win32/include.am new file mode 100644 index 000000000..dad59af3a --- /dev/null +++ b/src/win32/include.am @@ -0,0 +1,3 @@ + +EXTRA_DIST+= src/win32/orconfig.h + |