Public Git Hosting - ugit.git/commit

commit	b651cfc9ebd2a1a25c20167aff3d3db2c7a80834
author	David Aguilar <davvid@gmail.com>
	Mon, 14 Apr 2008 11:38:21 +0000 (14 04:38 -0700)
committer	David Aguilar <davvid@gmail.com>
	Mon, 14 Apr 2008 11:38:21 +0000 (14 04:38 -0700)
tree	50aba837fedd6778cdc3fc629acaa5b46c436e96	tree \| snapshot (tar.gz zip)
parent	04fd0fb96a3d7d4d3734b0a5f3ef1056537cdd3d	commit \| diff

controllers: added a merge controller

Signed-off-by: David Aguilar <davvid@gmail.com>

ugit/controllers/__init__.py		diff \| blob \| blame \| history
ugit/controllers/merge.py	[new file with mode: 0644]	blob
ugit/controllers/repobrowser.py		diff \| blob \| blame \| history
ugit/git.py		diff \| blob \| blame \| history
ugit/models.py		diff \| blob \| blame \| history
ugit/qobserver.py		diff \| blob \| blame \| history
ugit/views/__init__.py		diff \| blob \| blame \| history
ui/branch.ui		diff \| blob \| blame \| history
ui/merge.ui	[new file with mode: 0644]	blob

ugit: the pythonic git gui