Merge branch '1.6' of http://github.com/larskanis/fxruby into 1.6 (16a80fb8) · Commits · taylor-jaydee / fxruby · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

fxruby
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

Admin message

Repositories are limited in size now to 1GB. If your repository exceeds this size, it will be automatically deleted.

Admin message

If you'd like access to our CI/CD builders, please create an issue here.

16a80fb8

Commit 16a80fb8 authored 13 years ago by Lars Kanis

Downloads
- Plain Diff

Merge branch '1.6' of http://github.com/larskanis/fxruby into 1.6

Conflicts:
	ext/fox16/FXRuby.cpp

parents ebf47dda 4965951a

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

Rakefile.cross 2 additions, 1 deletion

Rakefile.cross
ext/fox16/FXRuby.cpp 6 additions, 5 deletions

ext/fox16/FXRuby.cpp
swig-interfaces/FXMemoryStream.i 9 additions, 5 deletions

swig-interfaces/FXMemoryStream.i
swig-interfaces/ruby-typemaps.i 4 additions, 4 deletions

swig-interfaces/ruby-typemaps.i
test/TC_FXDCPrint.rb 4 additions, 3 deletions

test/TC_FXDCPrint.rb

with 25 additions and 18 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment