diff options
author | Marc Maurer <uwog@uwog.net> | 2007-08-29 10:55:00 (GMT) |
---|---|---|
committer | Marc Maurer <uwog@uwog.net> | 2007-08-29 10:55:00 (GMT) |
commit | 2a803c040703dc3f5b2dba24546e3397d7aba466 (patch) | |
tree | a6947c623237bd863d6b1f29ecee230c94dc138a /toolbar.py | |
parent | d29b27c477ae237eab0a68956dec647983f44077 (diff) | |
parent | 2b5e3b32e2278b9dbeb2963f74804f7fbe0eaf24 (diff) |
Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/write
Conflicts:
NEWS
Diffstat (limited to 'toolbar.py')
0 files changed, 0 insertions, 0 deletions