diff options
| author | Michał Cichoń <michcic@gmail.com> | 2015-08-26 19:25:17 +0200 |
|---|---|---|
| committer | Michał Cichoń <michcic@gmail.com> | 2015-08-26 19:25:17 +0200 |
| commit | aa5b13651682f6dc0513d424e42dfcaa00e01ac1 (patch) | |
| tree | 83e9787d5e3834260598c6a4d3390d440a1104c2 /src/settings.h | |
| parent | 0ac2b95a1381dbed028058285529738a16466250 (diff) | |
| parent | 37ece1613d957f6b717826e0ca44bc676ff20e0b (diff) | |
| download | pianobar-windows-aa5b13651682f6dc0513d424e42dfcaa00e01ac1.tar.gz pianobar-windows-aa5b13651682f6dc0513d424e42dfcaa00e01ac1.tar.bz2 pianobar-windows-aa5b13651682f6dc0513d424e42dfcaa00e01ac1.zip | |
Merge branch 'windows-port' of https://github.com/thedmd/pianobar-windows into windows-port
Conflicts:
src/http.c
Diffstat (limited to 'src/settings.h')
0 files changed, 0 insertions, 0 deletions