Skip to content

Conversation

@Acuadros95
Copy link
Contributor

@Acuadros95 Acuadros95 commented Nov 19, 2021

This fix should be removed when this issue is solved

@Acuadros95 Acuadros95 requested a review from pablogs9 as a code owner November 19, 2021 10:06
@Acuadros95 Acuadros95 changed the base branch from main to galactic November 19, 2021 10:08
mergify bot and others added 2 commits November 19, 2021 11:10
(cherry picked from commit a4c138e)

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
@pablogs9
Copy link
Member

This should target main right?

mergify bot and others added 2 commits November 19, 2021 11:10
Signed-off-by: Joel Cao <joel.cao@oppo.com>

Co-authored-by: Joel Cao <joel.cao@oppo.com>
(cherry picked from commit 967e7ad)

Co-authored-by: kneep <alvin.cao@gmail.com>
@pablogs9 pablogs9 changed the base branch from galactic to main November 19, 2021 10:10
@Acuadros95 Acuadros95 changed the base branch from main to galactic November 19, 2021 10:13
@Acuadros95
Copy link
Contributor Author

@mergify backport main

@mergify
Copy link
Contributor

mergify bot commented Nov 19, 2021

backport main

🟠 Waiting for conditions to match

Details
  • merged [:pushpin: backport requirement]

Hey, I reacted but my real name is @Mergifyio

@Acuadros95
Copy link
Contributor Author

Acuadros95 commented Nov 19, 2021

@Acuadros95 Acuadros95 merged commit fa579fd into galactic Nov 19, 2021
@Acuadros95 Acuadros95 deleted the fix/cmake_depend branch November 19, 2021 10:57
mergify bot added a commit that referenced this pull request Nov 19, 2021
* Update README.md (#386) (#388)

(cherry picked from commit a4c138e)

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

* Remove references to log4cxx (#389)

* Add android support config (#396) (#405)

Signed-off-by: Joel Cao <joel.cao@oppo.com>

Co-authored-by: Joel Cao <joel.cao@oppo.com>
(cherry picked from commit 967e7ad)

Co-authored-by: kneep <alvin.cao@gmail.com>

* Temporal fix for cmake update

* Fix rebase

* Add fix to regular CI

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
Co-authored-by: kneep <alvin.cao@gmail.com>
(cherry picked from commit fa579fd)
@mergify
Copy link
Contributor

mergify bot commented Nov 19, 2021

backport main

✅ Backports have been created

Details

Acuadros95 added a commit that referenced this pull request Nov 19, 2021
* Update README.md (#386) (#388)

(cherry picked from commit a4c138e)

Co-authored-by: Pablo Garrido <pablogs9@gmail.com>

* Remove references to log4cxx (#389)

* Add android support config (#396) (#405)

Signed-off-by: Joel Cao <joel.cao@oppo.com>

Co-authored-by: Joel Cao <joel.cao@oppo.com>
(cherry picked from commit 967e7ad)

Co-authored-by: kneep <alvin.cao@gmail.com>

* Temporal fix for cmake update

* Fix rebase

* Add fix to regular CI

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
Co-authored-by: kneep <alvin.cao@gmail.com>
(cherry picked from commit fa579fd)

Co-authored-by: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com>
Acuadros95 added a commit that referenced this pull request Nov 23, 2021
Acuadros95 added a commit that referenced this pull request Nov 23, 2021
mergify bot pushed a commit that referenced this pull request Nov 23, 2021
This reverts commit fa579fd.

(cherry picked from commit 92599b1)
Acuadros95 added a commit that referenced this pull request Nov 23, 2021
This reverts commit fa579fd.

(cherry picked from commit 92599b1)

Co-authored-by: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants