diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-02-11 22:33:02 -0600 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-02-11 22:33:02 -0600 |
commit | f9b4521edc6a2370ca773aa80d3719d4bb45190d (patch) | |
tree | 47d70f7153b76720096786f33d4642d979286299 /ucb/source/ucp/ftp/ftpintreq.cxx | |
parent | af12942f68dba5d0d2b6fd39f63566d5fc3af4b8 (diff) |
merge non-conflicting changes in sysui and ucb
Diffstat (limited to 'ucb/source/ucp/ftp/ftpintreq.cxx')
-rw-r--r-- | ucb/source/ucp/ftp/ftpintreq.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx index 9d9bf49b28..ac668c4541 100644 --- a/ucb/source/ucp/ftp/ftpintreq.cxx +++ b/ucb/source/ucp/ftp/ftpintreq.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -228,3 +229,4 @@ bool XInteractionRequestImpl::approved() const return p1->isSelected(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |