summaryrefslogtreecommitdiff
path: root/src/daemon.py
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2012-04-27 23:09:26 +0200
committermathieui <mathieui@mathieui.net>2012-04-27 23:09:26 +0200
commitde63a1affdb57f521ab2e7a3e89182c79c1ebe2f (patch)
treecc983fc5a360cae7e922f2c707b834af20b50cab /src/daemon.py
parent2488216fbaa6c4a9b1f264ca455665ae1675a151 (diff)
parent2a3434b1f81bed7e6c781a9504a87905f2d07948 (diff)
downloadpoezio-de63a1affdb57f521ab2e7a3e89182c79c1ebe2f.tar.gz
poezio-de63a1affdb57f521ab2e7a3e89182c79c1ebe2f.tar.bz2
poezio-de63a1affdb57f521ab2e7a3e89182c79c1ebe2f.tar.xz
poezio-de63a1affdb57f521ab2e7a3e89182c79c1ebe2f.zip
Roster update: Merge branch 'master' of https://git.louiz.org/poezio
Conflicts: src/core.py src/tabs.py
Diffstat (limited to 'src/daemon.py')
0 files changed, 0 insertions, 0 deletions