aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #224 from andrewrk/fix-error-traittomaka2015-01-243-11/+22
|\ \
| * | fix for latest rustcAndrew Kelley2015-01-233-11/+22
|/ /
* | Merge pull request #223 from Ms2ger/CStringtomaka2015-01-231-1/+2
|\ \
| * | Fix a use-after-free in Android get_proc_address.Ms2ger2015-01-231-1/+2
|/ /
* | Merge pull request #219 from bjwbell/remove-deadcode-warningtomaka2015-01-231-0/+1
|\ \
| * | Remove deadcode warning in BuilderAttribsBryan Bell2015-01-231-0/+1
| |/
* | Merge pull request #218 from bjwbell/disable-unstable-warningstomaka2015-01-232-0/+2
|\ \ | |/ |/|
| * Disable compiler unstable warningsBryan Bell2015-01-222-0/+2
|/
* Merge pull request #217 from glennw/context-fallbacktomaka2015-01-222-2/+26
|\
| * Fix log prefixGlenn Watson2015-01-231-1/+1
| * Some GPU/driver combinations have glxCreateContextAttribsARB present, but it ...Glenn Watson2015-01-222-2/+26
* | Merge pull request #216 from jdm/osxBrendan Zabarauskas2015-01-222-20/+22
|\ \ | |/ |/|
| * Fix OS X build.Josh Matthews2015-01-212-20/+22
|/
* Merge pull request #215 from akiss77/pr-u8-c_char-upstreamtomaka2015-01-202-2/+2
|\
| * `c_char` isn't always `i8`Akos Kiss2015-01-202-2/+2
|/
* Merge pull request #214 from bjz/osx-windowBrendan Zabarauskas2015-01-201-62/+109
|\
| * Move osx delegate stuff into separate typeBrendan Zabarauskas2015-01-201-58/+108
| * if letifyBrendan Zabarauskas2015-01-191-8/+5
* | Merge pull request #213 from tomaka/permanent-iteratorstomaka2015-01-194-11/+33
|\ \ | |/ |/|
| * Iterators returned by wait_events and poll_events are now persistentPierre Krieger2015-01-194-11/+33
* | Merge pull request #211 from glennw/upstream-fixestomaka2015-01-196-3/+49
|\ \ | |/ |/|
| * Fix android APIGlenn Watson2015-01-191-1/+1
| * Add missing get_api stubs.Glenn Watson2015-01-196-3/+49
|/
* Merge pull request #210 from tomaka/fix-winapitomaka2015-01-181-2/+2
|\
| * Fix for changes in winapiPierre Krieger2015-01-181-2/+2
|/
* Merge pull request #209 from bjz/osx-windowtomaka2015-01-182-35/+29
|\
| * Clean up pattern matchesBrendan Zabarauskas2015-01-181-16/+14
| * Remove unnecessary inner methodBrendan Zabarauskas2015-01-181-16/+12
| * Squash some warningsBrendan Zabarauskas2015-01-181-3/+3
|/
* Merge pull request #208 from kazimuth/osxcontexttomaka2015-01-181-4/+10
|\
| * Remove AsciiExt import, s/uint/u32/, delete some files I accidentallyJames Gilles2015-01-176-2223/+5
| * Merge PixelPirate's changes and fix merge conflictsJames Gilles2015-01-176-4/+2228
|/|
| * Removed NSOpenGLPFAOpenGLProfiles enum in favor of the one defined in the App...Patrick Horlebein2014-12-301-15/+4
| * Fixed missing std::ascii::AsciiExt importPatrick Horlebein2014-12-301-0/+1
| * Minor match clause cleanupPatrick Horlebein2014-12-291-3/+1
| * Fixed deprecation warningsPatrick Horlebein2014-12-291-2/+2
| * Started adding support for selection OpenGL versions on OS X. Needs issue #17...Patrick Horlebein2014-12-291-4/+23
* | Merge pull request #207 from tomaka/update-rustctomaka2015-01-171-0/+1
|\ \
| * | Update for rustc/cargoPierre Krieger2015-01-171-0/+1
* | | Merge pull request #206 from tomaka/non-mutable-set-cursortomaka2015-01-171-1/+1
|\ \ \ | |/ / |/| |
| * | Change &mut self to &self in set_cursorBryan Bell2015-01-171-1/+1
|/ /
* | Merge pull request #204 from tomaka/fix-osx-attempttomaka2015-01-151-4/+4
|\ \
| * | More OS/X fixesPierre Krieger2015-01-151-4/+4
|/ /
* | Merge pull request #203 from tomaka/osx-fix-attempttomaka2015-01-151-2/+2
|\ \
| * | More OS/X fixesPierre Krieger2015-01-151-2/+2
|/ /
* | Merge pull request #202 from tomaka/osx-fix-attempttomaka2015-01-153-25/+25
|\ \
| * | Blind attempt to fix the OS/X buildPierre Krieger2015-01-153-25/+25
|/ /
* | Merge pull request #200 from ozkriff/mastertomaka2015-01-151-0/+1
|\ \
| * | android: Fixed depth bufferAndrey Lesnikov2015-01-151-0/+1
|/ /
* | Merge pull request #197 from ozkriff/mastertomaka2015-01-1310-90/+91
|\ \