projects / invirt/packages/invirt-dev.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c270399 97dfc56)
Fixed conflicts from version vs dev
authorSteven Valdez <dvorak42@mit.edu>
Wed, 20 Mar 2013 06:49:32 +0000 (02:49 -0400)
committerSteven Valdez <dvorak42@mit.edu>
Wed, 20 Mar 2013 06:49:32 +0000 (02:49 -0400)

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