5 Commits

Author	SHA1	Message	Date
Simon Sapin	8fbd363d52	servo: Merge #4893 - Upgrade to rustc ba2f13ef0 2015-02-04 (from servo:rustup_2015-01-31); r=Ms2ger,glennw ... Ready for review. Final link step on android fails, but we know how to fix it and will add it to this branch soon. Source-Repo: https://github.com/servo/servo Source-Revision: 2cc08f289ab909de44fa09a07b2c43b70ce379b9	2015-02-11 17:24:45 -07:00
Glenn Watson	f80bb76c8e	servo: Merge #4546 - Add ability to explicitly set static resources path, used by cef-linux (from glennw:cef-resources); r=larsbergstrom ... Source-Repo: https://github.com/servo/servo Source-Revision: 1699864f5339aaf463df5e2cf1d80193c3675e58	2015-01-08 15:27:54 -07:00
Simon Sapin	d266298e25	servo: Merge #4140 - Move the root Cargo.toml to components/servo, and warn when Cargo is run directly (from SimonSapin:no-root-cargo-toml); r=SimonSapin ... This fixes #3957, and allow #4115 not to regress #4099. Source-Repo: https://github.com/servo/servo Source-Revision: 873ca6cadddc1a40bead1f5dd0128bb16cfaa11b	2014-12-02 19:27:51 -07:00
Glenn Watson	637c437b35	servo: Merge #4013 - Redirect android resource folder (user-agent.css and friends) to /sdcard/servo (from glennw:android-resources); r=larsbergstrom ... This is a temporary solution, until they are packaged properly. Source-Repo: https://github.com/servo/servo Source-Revision: 1fd94adb3ddaa56c2e5fb41422960a8a433a6389	2014-11-16 18:12:28 -07:00
Simon Sapin	a08ac37856	servo: Merge #3601 - Read user-agent.css at run time. Fix #3516 (from SimonSapin:runtime-ua-stylesheet); r=jdm ... When we want to use Servo binaries outside of their `target` build directory, `./resources` is what we’ll need to ship with them. r? @jdm Source-Repo: https://github.com/servo/servo Source-Revision: 8312fde154768c4a5ce133a1aaaf1293529a5558	2014-10-08 00:42:36 -06:00