projects
/
platform
/
upstream
/
ninja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
51c9220
9da5b0c
)
Merge branch 'fix-provide-form' of git://github.com/yasuyk/ninja
author
Evan Martin
<martine@danga.com>
Tue, 21 Jan 2014 18:57:29 +0000
(10:57 -0800)
committer
Evan Martin
<martine@danga.com>
Tue, 21 Jan 2014 18:57:29 +0000
(10:57 -0800)
Conflicts:
misc/ninja-mode.el
1
2
misc/ninja-mode.el
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
misc/ninja-mode.el
index
2ab6a53
,
e4d9006
..
54b9b62
---
1
/
misc/ninja-mode.el
---
2
/
misc/ninja-mode.el
+++ b/
misc/ninja-mode.el
@@@
-47,4
-39,4
+45,6
@@@
;;;###autoload
(add-to-list 'auto-mode-alist '("\\.ninja$" . ninja-mode))
+ (provide 'ninja-mode)
++
+;;; ninja-mode.el ends here