diff options
| author | Dana Jansens <danakj@orodu.net> | 2009-12-21 10:43:38 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2009-12-21 10:43:38 -0500 |
| commit | a03b817aeb7fe32be881c30d50fab79455db08c5 (patch) | |
| tree | 0c3fffbd7ecd565cf1bfbf66be04e00563a3463f /tools | |
| parent | b7393636e05c95ec068e8a1ff063cbefa63a901b (diff) | |
| parent | 6d8b7bd5f7ede1803c1259f5c1b760e5dbf4dbe3 (diff) | |
Merge branch 'backport' into work
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/obxprop/Makefile (renamed from tools/obprop/Makefile) | 0 | ||||
| -rw-r--r-- | tools/obxprop/obxprop.c (renamed from tools/obprop/obprop.c) | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/tools/obprop/Makefile b/tools/obxprop/Makefile index cfc46539..cfc46539 100644 --- a/tools/obprop/Makefile +++ b/tools/obxprop/Makefile diff --git a/tools/obprop/obprop.c b/tools/obxprop/obxprop.c index e288d7cb..26851544 100644 --- a/tools/obprop/obprop.c +++ b/tools/obxprop/obxprop.c @@ -12,7 +12,7 @@ gint fail(const gchar *s) { else fprintf (stderr, - "Usage: obprop [OPTIONS]\n\n" + "Usage: obxprop [OPTIONS]\n\n" "Options:\n" " --help Display this help and exit\n" " --display DISPLAY Connect to this X display\n" |