aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #258 from ozkriff/android_color_and_depth_bitstomaka2015-02-081-11/+27
|\
| * android: Implemented color_bits and depth_bitsAndrey Lesnikov2015-02-081-11/+27
|/
* Merge pull request #255 from tomaka/updatetomaka2015-02-061-1/+2
|\
| * Update with libc changePierre Krieger2015-02-061-1/+2
|/
* Merge pull request #254 from aepsil0n/mousebutton-renamingtomaka2015-02-055-28/+28
|\
| * Rename enum variants of MouseButtonEduard Bopp2015-02-055-28/+28
* | Merge pull request #252 from Manishearth/linux-keystomaka2015-02-051-49/+49
|\ \ | |/ |/|
| * Add some more support for X11 keys (partially fixes #251)Manish Goregaokar2015-02-051-49/+49
|/
* Merge pull request #253 from tomaka/updatetomaka2015-02-051-1/+1
|\
| * Fix "fullscreen" example with latest rustcPierre Krieger2015-02-051-1/+1
|/
* Merge pull request #250 from bjz/osx-windowtomaka2015-02-031-1/+2
|\
| * Add tempory fix for #248Brendan Zabarauskas2015-02-031-1/+2
* | Merge pull request #247 from akiss77/pr-xerroreventtomaka2015-02-021-1/+1
|\ \
| * | Reorder the fields of `XErrorEvent` to match the struct layout found in recen...Akos Kiss2015-02-011-1/+1
|/ /
* | Merge pull request #241 from tomaka/add-webgltomaka2015-01-301-0/+2
|\ \
| * | Add WebGL in the APIs listPierre Krieger2015-01-291-0/+2
* | | Merge pull request #243 from bjz/osx-windowtomaka2015-01-301-29/+23
|\ \ \ | | |/ | |/|
| * | Fix OSX buildBrendan Zabarauskas2015-01-301-29/+23
|/ /
* | Merge pull request #239 from glennw/fix-close-crashtomaka2015-01-291-17/+25
|\ \ | |/ |/|
| * On some X11 driver implementations, calling XCloseDisplay from a different th...Glenn Watson2015-01-301-17/+25
|/
* Merge pull request #238 from andrewrk/mastertomaka2015-01-294-4/+4
|\
| * fix for rust nightlyAndrew Kelley2015-01-284-4/+4
|/
* Merge pull request #231 from bjz/osx-windowtomaka2015-01-265-21/+31
|\
| * Rename osx->cocoaBrendan Zabarauskas2015-01-265-2/+2
| * Implement some more osx stuffBrendan Zabarauskas2015-01-261-19/+29
* | Merge pull request #230 from retep998/update-winapitomaka2015-01-265-55/+72
|\ \
| * | Upgrade to latest winapiPeter Atashian2015-01-255-55/+72
|/ /
* | Merge pull request #229 from bjz/osxupBrendan Zabarauskas2015-01-261-8/+8
|\|
| * {true, false}->{YES, NO}Brendan Zabarauskas2015-01-261-8/+8
|/
* Merge pull request #220 from tomaka/x11-vsynctomaka2015-01-254-2/+96
|\
| * Implement vsync for x11 and add vsync examplePierre Krieger2015-01-234-2/+96
* | Merge pull request #221 from tomaka/fix-rctomaka2015-01-251-0/+5
|\ \
| * | Fix race condition with XOpenIMPierre Krieger2015-01-231-0/+5
| |/
* | 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