8000 Add C++11 keywords by jwillemsen · Pull Request #195 · rubychan/coderay · GitHub
[go: up one dir, main page]
Skip to content
8000

Add C++11 keywords #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jun 2, 2016
Merged

Add C++11 keywords #195

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f06e0e3
Add C++11 keywords
jwillemsen Mar 10, 2016
2612789
Fixed typo
jwillemsen Mar 11, 2016
92a8e56
Small changes to grouping of new C++11 keywords
jwillemsen Mar 13, 2016
2a4c37a
Merge branch 'master' of https://github.com/rubychan/coderay
jwillemsen Apr 3, 2016
dd142d2
Fixed merge
jwillemsen May 27, 2016
54c94b7
Add env setting to allow C extensions which are not allowed by defaul…
jwillemsen May 27, 2016
2bce2ac
Allow failures with jruby 18 and 19 mode, RedCloth has a known proble…
jwillemsen May 27, 2016
cd3bffb
Shouldn't have removed the jruby lines
jwillemsen May 27, 2016
dbec41f
Merged upstream
jwillemsen May 30, 2016
f664af2
Moved final from keywords to directive
jwillemsen May 30, 2016
1ad3f96
Removed merge issue
jwillemsen May 30, 2016
7e330ab
Removed double line
jwillemsen May 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Removed merge issue 
    * .travis.yml:
  • Loading branch information
@jwillemsen
jwillemsen committed May 30, 2016
commit 1ad3f9651b0cdc75b7efd819b112ffa1efa16538
1 change: 0 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ rvm:
- jruby-19mode
- jruby-head
- rbx-2
>>>>>>> de2e2acd91988e6b54f50f6c44ad85f28b68c615
branches:
only:
- master
Expand Down
0