aboutsummaryrefslogtreecommitdiff
path: root/defaults.c
diff options
context:
space:
mode:
authorDavid <dbphillipsnz@gmail.com>2014-07-20 13:25:37 +1200
committerDavid <dbphillipsnz@gmail.com>2014-07-20 13:25:37 +1200
commit64091a89f410fc46918ee05a0226ccce90559328 (patch)
treeb25f054759dda2c94c87cc3d8facfd31bd6aaa45 /defaults.c
parent0a915305a6481f3b9553511376358ab81a51724c (diff)
parentce5d47962ac628521a658f20b3f48aee7d041fe3 (diff)
downloadparamano-64091a89f410fc46918ee05a0226ccce90559328.tar.xz
Merge branch 'master' into stable
Conflicts: Makefile tray.c trayfreq.conf.src trayfreq_set_interface.c
Diffstat (limited to 'defaults.c')
0 files changed, 0 insertions, 0 deletions