summaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-05-01 18:48:01 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-05-01 18:48:01 -0500
commit563987d0a799f90b58a575b190a57546c335191b (patch)
tree6383b008e7be6cefaab9dfeaa1ba7374b322f169 /VERSION
parent15a0f3bf77cf60ae29484f0c0a26c679e4c688fd (diff)
parent276eda5735824dd6cf66e1f0951aa8af97354540 (diff)
downloadqemu-563987d0a799f90b58a575b190a57546c335191b.tar.gz
Merge remote-tracking branch 'kiszka/queues/slirp' into staging
* kiszka/queues/slirp: Declare state directory in smb.conf slirp: don't use "smb ports = 0" option
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions