summaryrefslogtreecommitdiffstats
path: root/tools/mergetr/mergetr.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-07-28 15:51:58 -0500
committerTimothy Pearson <[email protected]>2012-07-28 15:51:58 -0500
commitfe7969ef886d7287fa959929ddd33fbad8407884 (patch)
tree589aacc109d27561a5188bb46bce27c78bad8f5b /tools/mergetr/mergetr.cpp
parentdba8a853b65e5707e48450e5085e0ff0513b4203 (diff)
downloadtqt3-fe7969ef886d7287fa959929ddd33fbad8407884.tar.gz
tqt3-fe7969ef886d7287fa959929ddd33fbad8407884.zip
Automated update from Qt3
Diffstat (limited to 'tools/mergetr/mergetr.cpp')
-rw-r--r--tools/mergetr/mergetr.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/mergetr/mergetr.cpp b/tools/mergetr/mergetr.cpp
index b87875657..da978dc4e 100644
--- a/tools/mergetr/mergetr.cpp
+++ b/tools/mergetr/mergetr.cpp
@@ -331,7 +331,7 @@ int main( int argc, char* argv[] )
int orgfile = 1;
int newfile = 2;
- if ( argc <= newfile || argc > 1 && argv[1][0] == '-') {
+ if ( argc <= newfile || ( argc > 1 && argv[1][0] == '-' ) ) {
printf("usage: %s orgfile newfile [outfile]\n", argv[0]);
exit(1);
}