mirror of
https://github.com/xoureldeen/Vectras-VM-Android.git
synced 2026-07-09 17:28:54 +00:00
6130045432
- Added settings for X11 display. - Added option to run Qemu with Xterm. - Fixed missing fluxbox. - Improved X11 on Android 14+. - Improved System monitor stability. - Improved interface for Quick Edit. - Added option to check rom file before extracting. - Improved interface for Theme settings.
90 lines
1.5 KiB
Text
90 lines
1.5 KiB
Text
<<<<<<< HEAD
|
|
# Built application files
|
|
*.apk
|
|
*.aar
|
|
*.ap_
|
|
*.aab
|
|
|
|
# Files for the ART/Dalvik VM
|
|
*.dex
|
|
|
|
# Java class files
|
|
*.class
|
|
|
|
# Generated files
|
|
/bin/
|
|
/gen/
|
|
/out/
|
|
# Uncomment the following line in case you need and you don't have the release build type files in your app
|
|
# Gradle files
|
|
.gradle/
|
|
/build/
|
|
|
|
# Local configuration file (sdk path, etc)
|
|
local.properties
|
|
|
|
# Proguard folder generated by Eclipse
|
|
proguard/
|
|
|
|
# Log Files
|
|
*.log
|
|
|
|
# Android Studio Navigation editor temp files
|
|
.navigation/
|
|
|
|
# Android Studio captures folder
|
|
captures/
|
|
|
|
# IntelliJ
|
|
*.iml
|
|
.idea/
|
|
#.idea/workspace.xml
|
|
#.idea/tasks.xml
|
|
#.idea/gradle.xml
|
|
#.idea/assetWizardSettings.xml
|
|
#.idea/dictionaries
|
|
#.idea/libraries
|
|
# Android Studio 3 in .gitignore file.
|
|
#.idea/caches
|
|
#.idea/modules.xml
|
|
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
|
|
#.idea/navEditor.xml
|
|
.kotlin/
|
|
|
|
# Keystore files
|
|
# Uncomment the following lines if you do not want to check your keystore files in.
|
|
#*.jks
|
|
#*.keystore
|
|
|
|
# External native build folder generated in Android Studio 2.2 and later
|
|
.externalNativeBuild
|
|
.cxx/
|
|
|
|
# Google Services (e.g. APIs or Firebase)
|
|
# google-services.json
|
|
|
|
# Freeline
|
|
freeline.py
|
|
freeline/
|
|
freeline_project_description.json
|
|
|
|
# fastlane
|
|
fastlane/report.xml
|
|
fastlane/Preview.html
|
|
fastlane/screenshots
|
|
fastlane/test_output
|
|
fastlane/readme.md
|
|
|
|
# Version control
|
|
vcs.xml
|
|
|
|
# lint
|
|
lint/intermediates/
|
|
lint/generated/
|
|
lint/outputs/
|
|
lint/tmp/
|
|
# lint/reports/
|
|
=======
|
|
|
|
README.html
|
|
>>>>>>> c0dd0c334c2b69978b5e8f1c99558db65ea2f721
|