← Back to branch summary

~ubuntu-branches/ubuntu/saucy/filezilla/saucy-proposed

« back to all changes in this revision

Viewing changes to src/include/optionsbase.h

  • Committer: Package Import Robot
  • Author(s): Adrien Cunin
  • Date: 2012-12-07 17:17:17 UTC
  • mfrom: (1.1.31)
  • Revision ID: package-import@ubuntu.com-20121207171717-nt6as62u4pa1uv11
Tags: 3.6.0.2-1ubuntu1
* Merge from Debian experimental. Remaining Ubuntu change:
   - Added debian/patches/11_use-decimal-si-by-default.patch in order to
     comply with UnitsPolicy

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/include/optionsbase.h
9
9
 
10
10
enum engineOptions
11
11
{
12
 
        OPTION_USEPASV,                 // Use passive mode unless overridden by 
 
12
        OPTION_USEPASV,                 // Use passive mode unless overridden by
13
13
                                                        // server settings
14
14
        OPTION_LIMITPORTS,
15
15
        OPTION_LIMITPORTS_LOW,
16
16
        OPTION_LIMITPORTS_HIGH,
17
17
        OPTION_EXTERNALIPMODE,          /* External IP Address mode for use in active mode
18
18
                                                                   Values: 0: ask operating system
19
 
                                                                           1: use provided IP
 
19
                                                                                   1: use provided IP
20
20
                                                                                   2: use provided resolver
21
 
                                                            */
 
21
                                                                */
22
22
        OPTION_EXTERNALIP,
23
23
        OPTION_EXTERNALIPRESOLVER,
24
24
        OPTION_LASTRESOLVEDIP,