diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-28 12:44:04 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-28 12:44:04 -0500 |
| commit | 0a5a4e0568d4cc981457a2d1e7f86923eeff94ed (patch) | |
| tree | b752da16bc3ccfb9fbca9a5cd0f70fe72aede41e /json-lexer.c | |
| parent | 1658dd32408c75e850b55ab0ff70d5cc402674d5 (diff) | |
| parent | 6f06f178f96de3597e1098258ab5d11733ae8602 (diff) | |
Merge remote-tracking branch 'alon/libcacard' into staging
* alon/libcacard:
libcacard/vcard_emul_nss: add warning for old coolkey
libcacard/vcard_emul_nss: handle no readers at startup
libcacard/vcard_emul_nss: don't stop thread when there are no slots
Diffstat (limited to 'json-lexer.c')
0 files changed, 0 insertions, 0 deletions