diff options
author | Ray Strode <halfline@gmail.com> | 2021-02-22 21:20:43 +0000 |
---|---|---|
committer | Ray Strode <halfline@gmail.com> | 2021-02-22 21:20:43 +0000 |
commit | 86cf78e5e79eaa6a3edba3d54158d73c2b102fc3 (patch) | |
tree | 112deb0b4c295db90a7d12236a189d7935e9d495 | |
parent | c81730c6ff340e03ce917f9c54f5a856f7988899 (diff) | |
parent | 1dd13918be2764d4da3e1d59cccd1c12336254dc (diff) | |
download | gdm-86cf78e5e79eaa6a3edba3d54158d73c2b102fc3.tar.gz |
Merge branch 'nocpp' into 'master'
data: Invoke xrdb with -nocpp
See merge request GNOME/gdm!126
-rw-r--r-- | data/Init.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/Init.in b/data/Init.in index ec6fd395..86cc2d86 100644 --- a/data/Init.in +++ b/data/Init.in @@ -26,7 +26,7 @@ sysresources=/etc/X11/Xresources # merge in defaults if [ -f "$sysresources" ]; then - xrdb -merge "$sysresources" + xrdb -nocpp -merge "$sysresources" fi sysmodmap=/etc/X11/Xmodmap |