aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorSadaf Ebrahimi <sadafebrahimi@google.com>2023-08-10 20:32:18 +0000
committerSadaf Ebrahimi <sadafebrahimi@google.com>2023-08-10 22:53:37 +0000
commit56cd565b67a0dfce2918393e07b906b4d98f56d3 (patch)
treecb108291b7d40503c1a00dda5d10405ee77a33d5 /.gitignore
parentef43f2e0f904c4ad6c9a3cfbda5b448f190f054b (diff)
parente1774cd77f471443541596e09078e78fdc342e4f (diff)
downloadlibogg-56cd565b67a0dfce2918393e07b906b4d98f56d3.tar.gz
Upgrade libogg to v1.3.5
This project was upgraded with external_updater. Usage: tools/external_updater/updater.sh update libogg For more info, check https://cs.android.com/android/platform/superproject/+/main:tools/external_updater/README.md Test: TreeHugger Change-Id: Ic9ff472b12c5ea02fcc4a30e00c268df06fdb048
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore53
1 files changed, 53 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index ff6170f..f58ca32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
/build
/source/build
*.mode1v3
@@ -29,3 +30,55 @@
Debug/
Release/
release/
+=======
+aclocal.m4
+autom4te.cache
+ChangeLog
+compile
+config.guess
+config.h
+config.h.in
+config.h.in~
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libogg.spec
+libtool
+ltmain.sh
+Makefile
+Makefile.in
+missing
+mkinstalldirs
+ogg.pc
+ogg-uninstalled.pc
+stamp-h1
+.project
+include/ogg/config_types.h
+src/*.o
+src/*.lo
+src/lib*.la
+src/.libs
+src/.deps
+src/test_*
+macosx/build/
+/m4
+
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+CMakeSettings.json
+
+*[Bb]uild*/
+
+.vs/
+.vscode/
+>>>>>>> v1.3.5