← Back to branch summary

~kamstrup/zeitgeist/blacklist

~kamstrup/zeitgeist/blacklist

Viewing all changes in revision 1243.

Committer: "Mikkel Kamstrup Erlandsen"
Date: 2009-12-29 19:05:22 UTC
mfrom: (1233.1.8 zeitgeist-trunk)
Revision ID: mikkel.kamstrup@gmail.com-20091229190522-1mj8w3u8dwyi13x6

Merge in latest changes from trunk in order to have a clean diff for review

files added:
doc/zeitgeist/source/client.rst

doc/zeitgeist/source/datamodel.rst

doc/zeitgeist/source/dbus_api.rst

doc/zeitgeist/source/engine.rst

doc/zeitgeist/source/tutorial_engine_extension.rst

files renamed:
doc/dbus/ => doc/zeitgeist/

files modified:
.bzrignore

_zeitgeist/engine/remote.py

_zeitgeist/engine/resonance_engine.py

doc/Makefile.am

doc/zeitgeist/source/conf.py

doc/zeitgeist/source/index.rst

test/datamodel-test.py

test/remote-test.py

test/resonance-engine-test.py

zeitgeist/client.py

zeitgeist/datamodel.py

Show diffs side-by-side

added added

removed removed

_zeitgeist/engine/remote.py

_zeitgeist/engine/resonance_engine.py

doc/Makefile.am

doc/zeitgeist/source/client.rst

doc/zeitgeist/source/conf.py

doc/zeitgeist/source/datamodel.rst

doc/zeitgeist/source/dbus_api.rst

doc/zeitgeist/source/engine.rst

doc/zeitgeist/source/index.rst

doc/zeitgeist/source/tutorial_engine_extension.rst@

test/datamodel-test.py

test/remote-test.py

test/resonance-engine-test.py

zeitgeist/client.py

zeitgeist/datamodel.py

Older »