Skip to content

Commit

Permalink
Merge branch 'master' into gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
lightyang0 committed Apr 19, 2012
2 parents e36c0de + 52bbe0e commit 319288a
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions README.md
@@ -1,5 +1,9 @@
PolymetricExpression
Polymetric Expression
====================
A CS1010R javascript project by Yang Mansheng and Yang Zhixing, supervised by Associate Professor Martin Henz
and Srikumar Karaikudi Subramaniam, in collaboration with Lee Zhi Xin and Rose Marie Tan who worked on the
Generative Grammar(https://github.com/rosemarietan/GenerativeGrammar/) Project.
Generative Grammar(https://github.com/rosemarietan/GenerativeGrammar/) Project.

Project Home Page
====================
http://fightangel.github.com/PolymetricExpression/

0 comments on commit 319288a

Please sign in to comment.