diff options
| author | Moritz Lenz <moritz@faui2k3.org> | 2014-04-01 19:40:30 +0200 |
|---|---|---|
| committer | Moritz Lenz <moritz@faui2k3.org> | 2014-04-01 19:40:30 +0200 |
| commit | a1e13d679c5311fc5cfb9a33a577f52187b4286c (patch) | |
| tree | dfaae6c5c392ccf83082b85f6d8cb3bde8f83662 /.gitignore | |
| parent | 6363be3b2438a93af3a19366960c69e23fe6934e (diff) | |
| parent | f2236b4d8ff36dd6810ac85f24d69dd22f23933b (diff) | |
Merge remote-tracking branch 'origin/tristar'
Conflicts:
tools/build/Makefile.in
tools/star/Makefile
tools/star/release-guide.pod
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,6 +1,7 @@ MANIFEST rakudo nqp +MoarVM parrot src config.status |