summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Steele [Wed, 22 May 2013 21:08:55 +0000 (23:08 +0200)]
test
Steele [Wed, 22 May 2013 21:01:23 +0000 (23:01 +0200)]
more copy edits
Steele [Wed, 22 May 2013 20:56:52 +0000 (22:56 +0200)]
fix conflict
Steele [Wed, 22 May 2013 20:51:28 +0000 (22:51 +0200)]
fix merge
Steele [Wed, 22 May 2013 20:50:15 +0000 (22:50 +0200)]
test
Steele [Wed, 22 May 2013 20:33:21 +0000 (22:33 +0200)]
edit in trymerge
Steele [Wed, 22 May 2013 20:32:51 +0000 (22:32 +0200)]
edit in master
Steele [Wed, 22 May 2013 20:30:49 +0000 (22:30 +0200)]
edit trymerge
Steele [Wed, 22 May 2013 20:26:24 +0000 (22:26 +0200)]
Replaced code1 files with code2 files in the trymerge branch
Steele [Wed, 22 May 2013 20:11:40 +0000 (22:11 +0200)]
initial commit