Merge branch 'fix-warning' of git://github.com/yasuyk/ninja
authorEvan Martin <martine@danga.com>
Tue, 21 Jan 2014 18:56:43 +0000 (10:56 -0800)
committerEvan Martin <martine@danga.com>
Tue, 21 Jan 2014 18:56:43 +0000 (10:56 -0800)
commit51c9220f533d61020e789a07d09456d7d59c101a
tree0f87b08b11a56f986b44ea547a64506b8bd3ec0a
parent1c41be988b6ee250b412a8e3fb4e55ce617a30f9
parent8596ba60814f2ca57bf4969253b09807b4f3cac4
Merge branch 'fix-warning' of git://github.com/yasuyk/ninja

Conflicts:
misc/ninja-mode.el
misc/ninja-mode.el