diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2012-04-02 00:31:52 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2012-04-02 00:31:52 +0200 |
| commit | e58cdd2a130ef619e54360207761bc50b2d39f83 (patch) | |
| tree | 9b6379952c93bcfdb27c5bdc0de70d71a3293769 | |
| parent | 5c4124559127f8ce991e31e4ea8a40516fe0757a (diff) | |
| parent | 60e455575bf9ab6177014f662c50991a6db3df4a (diff) | |
| download | coderay-e58cdd2a130ef619e54360207761bc50b2d39f83.tar.gz | |
Merge branch 'master' into independent-lines
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,3 +1,4 @@ +.DS_Store *.gem *.rbc .bundle |