Allow -upnp to override setting in wallet (and simplify logic a bit)
authorGavin Andresen <gavinandresen@gmail.com>
Wed, 1 Feb 2012 18:24:15 +0000 (13:24 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Wed, 1 Feb 2012 18:24:15 +0000 (13:24 -0500)
commit8beb917c6c2d70e245116ead8789767b0c58e2f6
tree370bda8ad78cf74d24dd80ebff0569c9b94f0d5f
parent177dbcaace432f46b191add5c26226dbaac2c81c
Allow -upnp to override setting in wallet (and simplify logic a bit)
src/init.cpp