Permalink
Browse files

Merge branch 'master' of github.com:liweinan/recipies

Conflicts:
	.gitignore
  • Loading branch information...
2 parents 7873792 + e772ddf commit 0d6ce0ab1e2aab6c2c594c22c4d79c81d94217a0 @liweinan committed with Mar 9, 2013
Showing with 2 additions and 0 deletions.
  1. +2 −0 .gitignore
View
@@ -3,3 +3,5 @@ tmp
*.o
*.exe
*~
+lex.yy.c
+

0 comments on commit 0d6ce0a

Please sign in to comment.