Commit 62cf0afb authored by David Goulet's avatar David Goulet
Browse files

Merge branch 'main' of gitlab.torproject.org:tpo/core/onionmasq

parents 98451760 89936828

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -5,3 +5,4 @@ 
# Added by cargo



/target

*.DS_Store

android/ArtiToyVPN/.gitignore

0 → 100644
+15 −0
Original line number Diff line number Diff line 
*.iml

.gradle

/local.properties

/.idea/caches

/.idea/libraries

/.idea/modules.xml

/.idea/workspace.xml

/.idea/navEditor.xml

/.idea/assetWizardSettings.xml

.DS_Store

/build

/captures

.externalNativeBuild

.cxx

local.properties

android/ArtiToyVPN/.idea/.gitignore

0 → 100644
+3 −0
Original line number Diff line number Diff line 
# Default ignored files

/shelf/

/workspace.xml

android/ArtiToyVPN/.idea/compiler.xml

0 → 100644
+6 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="CompilerConfiguration">

    <bytecodeTargetLevel target="11" />

  </component>

</project>
 
 No newline at end of file

android/ArtiToyVPN/.idea/deploymentTargetDropDown.xml

0 → 100644
+17 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="deploymentTargetDropDown">

    <runningDeviceTargetSelectedWithDropDown>

      <Target>

        <type value="RUNNING_DEVICE_TARGET" />

        <deviceKey>

          <Key>

            <type value="SERIAL_NUMBER" />

            <value value="LGH8507d6f869b" />

          </Key>

        </deviceKey>

      </Target>

    </runningDeviceTargetSelectedWithDropDown>

    <timeTargetWasSelectedWithDropDown value="2022-02-16T22:41:20.375263Z" />

  </component>

</project>
 
 No newline at end of file