Public Git Hosting - slc.treecategories.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 652f53b 087e115)

commit	059eef212a9faf0dbc5d8ff753ae16f6b1f4dbe7
author	Patrick Gerken <patrick@do3.cc>
	Mon, 1 Feb 2010 15:36:19 +0000 (1 16:36 +0100)
committer	Patrick Gerken <patrick@do3.cc>
	Mon, 1 Feb 2010 15:36:19 +0000 (1 16:36 +0100)
tree	09f97d2faca22ee7fabb288b41eddb9517dd661b	tree \| snapshot (tar.gz zip)
parent	652f53be529ebbd8431db9311f276aff9cecc56a	commit \| diff
parent	087e1158afd7cbea433cc32ad324fc57d99ed19d	commit \| diff

Merge commit 'origin/master'

Conflicts:
src/slc/treecategories/skins/slc.treewidget/tree.js
src/slc/treecategories/tests/runner.html

Support for Treecategories in Plone