?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: efcf625 8407301)
Merge branch 'powerpoint' of ssh://repo.or.cz/srv/git/Science-Project
commit4f028e01f954f8d85be8acf4ec4c66097d98c95b
authorAlex Stubbins <darklinkxxxx@gmail.com>
Thu, 22 Apr 2010 13:41:20 +0000 (22 06:41 -0700)
committerAlex Stubbins <darklinkxxxx@gmail.com>
Thu, 22 Apr 2010 13:41:20 +0000 (22 06:41 -0700)
tree4f463b3167051bffc319065a3a46ef797609d961tree | snapshot (tar.gz zip)
parentefcf625cc9c09fbcf9b32960776658bb4d565414commit | diff
parent84073016f2f8ae6b2dfab7f3c5b1f69935af1954commit | diff
Merge branch 'powerpoint' of ssh://repo.or.cz/srv/git/Science-Project

Conflicts:
Science_Project.ppt