aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | x11, android, win32: [ui]size, [u]int -> [ui]32Andrey Lesnikov2015-01-1310-90/+91
* | | Merge pull request #196 from ozkriff/mastertomaka2015-01-131-1/+1
|\| |
| * | Fixed android: Added 'MouseCursor' importAndrey Lesnikov2015-01-131-1/+1
|/ /
* | Merge pull request #192 from bjwbell/mouse-cursorstomaka2015-01-138-4/+179
|\ \
| * | Code review commentsBryan Bell2015-01-132-1/+2
| * | Fix OS X & Win32 buildsBryan Bell2015-01-122-2/+2
| * | Refine X11 cursor selectionsBryan Bell2015-01-121-19/+22
| * | Add mouse cursor supportBryan Bell2015-01-129-3/+174
* | | Merge pull request #195 from tomaka/appveyor-badgetomaka2015-01-131-0/+1
|\ \ \
| * | | Add appveyor build status in READMEPierre Krieger2015-01-131-0/+1
|/ / /
* | | Merge pull request #193 from bjwbell/int-and-uint-to-u-and-isizetomaka2015-01-134-35/+35
|\ \ \ | |/ / |/| |
| * | Change uint/int to usize/isizeBryan Bell2015-01-124-35/+35
|/ /
* | Merge pull request #191 from sbward/osx-1.0-alphatomaka2015-01-123-16/+26
|\ \
| * | Revert arch_64 feature flag for rust-cocoaSam Ward2015-01-111-1/+0
| * | OSX compatibility for Rust 1.0 alphaSam Ward2015-01-103-16/+27
* | | Bump version numberPierre Krieger2015-01-101-2/+2
|/ /
* | Merge pull request #190 from tomaka/update-rustctomaka2015-01-108-14/+11
|\ \
| * | Update for rust alpha 1.0Pierre Krieger2015-01-108-14/+11
|/ /
* | Merge pull request #189 from ozkriff/mastertomaka2015-01-081-5/+3
|\ \
| * | android: Updated for Rust ea6f65c5f 2015-01-06Andrey Lesnikov2015-01-081-5/+3
|/ /
* | Merge pull request #187 from tomaka/update-rustctomaka2015-01-0810-58/+52
|\ \
| * \ Merge remote-tracking branch 'cybergeek94/master' into update-rustcPierre Krieger2015-01-083-27/+34
| |\ \
| | * | Update to latest Rust nightlyAustin Bonander2015-01-085-37/+41
| |/ / |/| |
| * | Update for RustcPierre Krieger2015-01-088-31/+18
|/ /
* | Merge pull request #186 from tomaka/update-rustctomaka2015-01-054-8/+8
|\ \
| * | Update for RustcPierre Krieger2015-01-054-8/+8
|/ /
* | Merge pull request #184 from mikedilger/upstream_fallouttomaka2015-01-051-3/+7
|\ \
| * | fix for Iterator now using associated typesMike Dilger2015-01-051-3/+7
|/ /
* | Merge pull request #183 from ozkriff/mastertomaka2015-01-041-2/+3
|\ \
| * | android: Updated for rust fc2ba1393 2015-01-03Andrey Lesnikov2015-01-041-2/+3
|/ /
* | Merge pull request #181 from tomaka/update-rustctomaka2015-01-0312-27/+32
|\ \