py2010-mercurial

changeset 99:f4a856dd38d2
Merge.
author: Peter Zotov <whitequark@whitequark.org>
date: Tue, 23 Nov 2010 13:12:06 +0300
parents: e939eb9dce6e ee74c050fae5
children: 10466226dd44
files: README
diffstat: 1 files changed, 2 insertions(+), 2 deletions(-) [+]
[-]

README 4 README 4
README 4
     1.1 --- a/README	Mon Nov 22 01:33:26 2010 +0300
     1.2 +++ b/README	Tue Nov 23 13:12:06 2010 +0300
     1.3 @@ -60,7 +60,7 @@
     1.4  
     1.5  19.
     1.6  
     1.7 -20.
     1.8 +20. Olga Zolotareva, 2nd year, FBB. I've studied C in school
     1.9  
    1.10  21.
    1.11  
    1.12 @@ -68,4 +68,4 @@
    1.13  
    1.14  23.
    1.15  
    1.16 -
    1.17 +42. Peter Zotov, 2nd year, FBB. C/C++, Ruby, JS