diff options
author | Aaron Plattner <aplattner@nvidia.com> | 2014-08-01 23:10:46 -0700 |
---|---|---|
committer | Aaron Plattner <aplattner@nvidia.com> | 2014-08-01 23:10:46 -0700 |
commit | 20d76f773cf8de474cf7a3f1082961605732c3f1 (patch) | |
tree | e63755c11ff7ab471427d8ce319e1e0fe1f9071b | |
parent | 00477d88297eaa6c87aa144548590c32540e3928 (diff) | |
parent | 193a358563a59c1a3fc55f55029c605e2419c80b (diff) |
Merge commit '193a358'
Conflicts:
xrandr.c
-rw-r--r-- | xrandr.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -139,6 +139,7 @@ usage(void) " --crtc <crtc>\n" " --panning <w>x<h>[+<x>+<y>[/<track:w>x<h>+<x>+<y>[/<border:l>/<t>/<r>/<b>]]]\n" " --gamma <r>:<g>:<b>\n" + " --brightness <value>\n" " --primary\n" " --noprimary\n" " --newmode <name> <clock MHz>\n" |