projects
/
platform
/
upstream
/
xorg-server.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
96a28e9
7950664
)
Merge remote-tracking branch 'whot/for-keith'
author
Keith Packard
<keithp@keithp.com>
Wed, 12 Mar 2014 05:04:36 +0000
(22:04 -0700)
committer
Keith Packard
<keithp@keithp.com>
Wed, 12 Mar 2014 05:04:36 +0000
(22:04 -0700)
1
2
config/config.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
config/config.c
Simple merge