git.shadowcat.co.uk Git - urisagit/Stem.git/commit

projects / urisagit/Stem.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 56f74eb)

author	Uri Guttman <uri@quad.(none)>
	Wed, 23 Sep 2009 06:57:52 +0000 (02:57 -0400)
committer	Uri Guttman <uri@quad.(none)>
	Wed, 23 Sep 2009 06:57:52 +0000 (02:57 -0400)
commit	09baddbd49de087e08177d20594c9d313b542949
tree	2f7cad41cf66142988ce4f5a8073a2a5ee8447f8	tree \| snapshot
parent	56f74ebb051e474ced234286cd79303f3e9cd14c	commit \| diff

Merge branch 'master' of ssh://erxz.com/~/git_repo/stem

Conflicts:
MANIFEST

.gitignore		diff \| blob \| blame \| history
Build.PL		diff \| blob \| blame \| history
BuildStem.pm		diff \| blob \| blame \| history
MANIFEST.SKIP		diff \| blob \| blame \| history
extras/ssfe.1	[deleted file]	blob \| blame \| history
extras/ssfe.c	[deleted file]	blob \| blame \| history
notes/srs_notes.txt		diff \| blob \| blame \| history
srs_notes.txt	[deleted file]	blob \| blame \| history

Unnamed repository; edit this file 'description' to name the repository.