diff options
| author | Lukas Fleischer <calcurse@cryptocrack.de> | 2012-05-23 22:23:07 +0200 |
|---|---|---|
| committer | Lukas Fleischer <calcurse@cryptocrack.de> | 2012-05-23 22:26:05 +0200 |
| commit | f5efea85a6874e4dcb206f91cedf29ef3d56f06b (patch) | |
| tree | f678e72cb80226f178ef89a9faf52166701a64cf /po%253fid%253d1019be7cced2c0dfb677336ee2fe1da8bfde5a22%3fid%3d6898a9dcf1f3614f5c132d4649f3d414feb6df5e?id=f5efea85a6874e4dcb206f91cedf29ef3d56f06b | |
| parent | 7fa1f0e2aa70a610d6de76e2194857b2ddc36b18 (diff) | |
| parent | b4cefe2db9d45dfba9bfd633288a406a8ad2a4c3 (diff) | |
Merge branch 'maint'
Conflicts:
src/io.c
src/notify.c
src/utils.c
Diffstat (limited to 'po%253fid%253d1019be7cced2c0dfb677336ee2fe1da8bfde5a22%3fid%3d6898a9dcf1f3614f5c132d4649f3d414feb6df5e?id=f5efea85a6874e4dcb206f91cedf29ef3d56f06b')
0 files changed, 0 insertions, 0 deletions