summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1095 from sgraham/dupbuild-errNico Weber2016-01-274-47/+63
|\
| * Make dupbuild=err work in subninjaScott Graham2016-01-274-47/+63
|/
* Merge pull request #1094 from sphawk/masterNico Weber2016-01-271-1/+1
|\
| * fix for localized version of cl.exesphawk2016-01-251-1/+1
* | Merge pull request #1085 from tetsuok/remove-unnecessary-stdNico Weber2016-01-275-11/+11
|\ \ | |/ |/|
| * Remove unnecessary `std::`Tetsuo Kiso2016-01-105-11/+11
* | Merge pull request #1086 from tetsuok/use-container-based-infra-for-ciEvan Martin2016-01-101-0/+1
|\ \ | |/ |/|
| * Use container-based infrastructure for travis-ci.Tetsuo Kiso2016-01-101-0/+1
|/
* Merge pull request #1073 from ninja-build/manual-fontNico Weber2015-12-291-6/+0
|\
| * use the default font size for manual headingsEvan Martin2015-12-161-6/+0
* | Merge pull request #1074 from ninja-build/manual-commandNico Weber2015-12-291-6/+24
|\ \
| * | add a section to the manual discussing the command= variableEvan Martin2015-12-161-6/+24
| |/
* | Merge pull request #1082 from nicolasdespres/zshcomp-intermediary-targetsNico Weber2015-12-291-3/+2
|\ \
| * | Teach zsh to complete intermediary targets.Nicolas Despres2015-12-241-3/+2
|/ /
* | Merge pull request #1069 from nicolasdespres/dry_manifest_regenEvan Martin2015-12-091-0/+4
|\ \
| * | Do not attempt to rebuild infinitely in dry-run mode.Nicolas Despres2015-12-091-0/+4
|/ /
* | Merge pull request #1042 from avallee/masterEvan Martin2015-12-062-2/+9
|\ \
| * | Disable long word wrapping entirely in comments.Alex Vallée2015-11-272-10/+3
| * | Fix indent in pull request #1042.Alex Vallee2015-11-121-1/+1
| * | Fix wrapping file paths in Writer.commentAlex Vallée2015-10-232-2/+16
* | | Merge pull request #1062 from tfarina/bindings-typedefEvan Martin2015-12-062-3/+3
|\ \ \
| * | | make use of Bindings typedefThiago Farina2015-12-042-3/+3
* | | | Merge pull request #1063 from ptzz/masterEvan Martin2015-12-061-1/+1
|\ \ \ \
| * | | | Fix typoptzz2015-12-061-1/+1
| |/ / /
* | | | Merge pull request #1064 from NiklasRosenstein/1043-msvc_deps_prefix-per-ruleEvan Martin2015-12-061-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | add "msvc_deps_prefix" to Rule::IsReservedBinding()Niklas Rosenstein2015-12-061-1/+2
|/ / /
* | | prefer https in readmeNico Weber2015-11-191-2/+2
* | | Merge pull request #1053 from ninja-build/configureNico Weber2015-11-181-7/+12
|\ \ \
| * | | when building with cwd = source root, use relative pathsEvan Martin2015-11-171-1/+6
| * | | rename the build-file variable $sourcedir to $rootEvan Martin2015-11-171-6/+6
| * | | put warning flags togetherEvan Martin2015-11-171-1/+1
|/ / /
* | | Merge pull request #1052 from ninja-build/docsNico Weber2015-11-175-10/+47
|\ \ \
| * | | drop a [horizontal] definition tableEvan Martin2015-11-171-1/+0
| * | | improve docs generation, including PDF outputEvan Martin2015-11-174-7/+45
| * | | provide a better title for the manualEvan Martin2015-11-171-2/+2
|/ / /
* | | Merge pull request #1047 from pykello/masterNico Weber2015-11-121-3/+2
|\ \ \
| * | | Speed-up bash target auto-complete.Hadi Moshayedi2015-10-311-3/+2
| |/ /
* | | Merge pull request #1046 from zed0/masterNico Weber2015-11-121-2/+1
|\ \ \
| * | | Speed up zsh target completionBen Falconer2015-10-301-2/+1
| |/ /
* | | Merge pull request #1007 from mikesep/aixEvan Martin2015-11-129-16/+71
|\ \ \
| * | | Separate bootstrapped build from final buildMike Seplowitz2015-10-222-10/+24
| * | | Fix getopt for AIXMike Seplowitz2015-08-195-0/+12
| * | | Implement GetLoadAverage on AIX using libperfstatMike Seplowitz2015-08-192-0/+15
| * | | Fix AIX compilation error related to printf macrosMike Seplowitz2015-08-191-3/+8
| * | | Start AIX portMike Seplowitz2015-08-191-2/+11
| * | | Strip tabs from od's outputMike Seplowitz2015-08-191-1/+1
* | | | Merge pull request #999 from colincross/dumbstatusNico Weber2015-11-121-2/+3
|\ \ \ \
| * | | | Print status when edge finishes on dumb terminalsColin Cross2015-07-311-2/+3
* | | | | Merge pull request #964 from nicolasdespres/sighupNico Weber2015-11-123-1/+36
|\ \ \ \ \
| * | | | | Cleanup build on SIGHUP.Nicolas Despres2015-09-203-1/+36
| | |_|_|/ | |/| | |