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

Conflicts: Rakefile
larskanis · Feb 15, 2013 · e63e117 · e63e117
2 parents c2fbd97 + 238f376
commit e63e117
Show file tree

Hide file tree

Showing 238 changed files with 267 additions and 267 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,13 +2,13 @@ doap.rdf
 *.tmproj
 doc/api
 users_guide/*.html
-ext/fox16/*_wrap.cpp
-ext/fox16/*.o
-ext/fox16/conftest.dSYM
-ext/fox16/include/inlinestubs.h
-ext/fox16/librb.c
-ext/fox16/fox16.bundle
-ext/fox16/mkmf.log
+ext/fox16_c/*_wrap.cpp
+ext/fox16_c/*.o
+ext/fox16_c/conftest.dSYM
+ext/fox16_c/include/inlinestubs.h
+ext/fox16_c/librb.c
+ext/fox16_c/fox16.bundle
+ext/fox16_c/mkmf.log
 lib/fox16/kwargs.rb
 fox-includes/diffs.py
 fox-includes/diffs.txt