Merge remote-tracking branches 'merge-requests/6' and 'merge-requests/7'
authorKlaus Ethgen <Klaus@Ethgen.de>
Sun, 20 Jul 2014 12:57:40 +0000 (13:57 +0100)
committerKlaus Ethgen <Klaus@Ethgen.de>
Sun, 20 Jul 2014 12:57:40 +0000 (13:57 +0100)
commitd6c33614c45e38845a0bcfd702e38e18d5dcec0b
treed30f2a53b6900cf2c4d3850d4fdb5f0b5eae8068
parente79d3547fb650e5f45cb9c30707724c221fdfc20
parentdcf1a1bf00f27440ae8d333e345f3a562f03459b
parent0ac57169c3c70c9b6c7e68033982a03511b79640
Merge remote-tracking branches 'merge-requests/6' and 'merge-requests/7'

* merge-requests/6:
  Bug 3594998: make lirc initialization quieter

* merge-requests/7:
  Add filedata counting to watch for filedata leaks
  Use FileData locks to avoid expensive reloads with marks enabled
  Add "lock" functionality to keep FileDatas in memory
src/filedata.c