?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: bab9271 8891396)
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
commit578865ebdcc78c06ce08f70aea7883465cc26240
authorCarsten Dominik <carsten.dominik@gmail.com>
Mon, 10 Mar 2008 17:02:45 +0000 (10 18:02 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Mon, 10 Mar 2008 17:02:45 +0000 (10 18:02 +0100)
tree08d2e981affc84088a610c9ad560d05702a9d34ctree | snapshot (tar.gz zip)
parentbab92717e5a3630838d5563c4c10c5de4b584c8bcommit | diff
parent8891396992860a0550811caeccb2f7e8462c90f4commit | diff
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

Conflicts:

ORGWEBPAGE/Changes.org
Org-mode, an Emacs mode for organizing your life.