← Back to branch summary

~ruinibau/zim/wiki-syntax

~ruinibau/zim/wiki-syntax

Viewing all changes in revision 343.

Committer: Rui Nibau
Date: 2011-02-02 19:07:59 UTC
mfrom: (340.1.4 pyzim-trunk)
Revision ID: rui.nibau@omacronides.com-20110202190759-0e6g4z34ktzt4a9b

merge main branch

files added:
zim/gui/cleannotebookdialog.py

files renamed:
data/templates/wiki/_Calendar.txt => data/templates/wiki/Calendar.txt

data/templates/wiki/_New.txt => data/templates/wiki/Default.txt

files modified:
data/manual/Help/Menu_Items.txt

data/menubar.xml

tests/export.py

zim/config.py

zim/daemon.py

zim/gui/__init__.py

zim/gui/exportdialog.py

zim/gui/pageview.py

zim/gui/widgets.py

zim/notebook.py

zim/plugins/calendar.py

Show diffs side-by-side

added added

removed removed

data/manual/Help/Menu_Items.txt

data/menubar.xml

tests/export.py

zim/gui/__init__.py

zim/gui/cleannotebookdialog.py

zim/gui/exportdialog.py

zim/gui/pageview.py

zim/gui/widgets.py

zim/notebook.py

zim/plugins/calendar.py

Older »