merge

2013-01-18 13:14:50 +01:00 · 2013-01-18 13:14:50 +01:00 · ece0b66739
parent 6a0e85ad9c 509ff2e8fa
commit ece0b66739
3 changed files with 4 additions and 0 deletions
--- a/lib/theo
+++ b/lib/theo
@ -222,3 +222,5 @@ As developers we make decisions which we believe serve our users the best.
 Wow, what's that got to do with anything?
 c++ is a pile of crap.
 You have this very wrong.
+Your code is completely wrong.
+No way.
--- a/lib/troll
+++ b/lib/troll
@ -113,3 +113,4 @@ Subject: [go-nuts] Re: php eval equivalent in go
 did anyone at iwp9 give an update about osprey? anyone ask when it'll be available?
 just run linux -- aiju
 I'm fairly new to plan9, and am having trouble ssh'ing to my mac.
+Subject: [golang-dev] not reading code
--- a/sys/games/lib/fortunes
+++ b/sys/games/lib/fortunes
@ -4798,3 +4798,4 @@ My curtain automation is very loud. -- jwz
 I don't want Javascript promises
 --- you can reply above this line ---
 MIT OpenCourseware >> Electrical Engineering and Computer Science >> Introduction to Electrical Engineering and Computer Science I >> Python Tutorial
+(#plan9) semka → May be I should ask at #cat-v :)