Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dkim-coder/FlappyCow-TeamProject
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: check
Choose a base ref
...
head repository: dkim-coder/FlappyCow-TeamProject
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 4 commits
  • 65 files changed
  • 2 contributors

Commits on Dec 1, 2022

  1. led 수정 && 버튼

    @yosebeee
    yosebeee committed Dec 1, 2022
    Configuration menu
    Copy the full SHA
    55a0e2c View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2022

  1. Merge remote-tracking branch 'origin/master' 

    # Conflicts:
#	app/.cxx/cmake/debug/armeabi-v7a/.ninja_deps
#	app/.cxx/cmake/debug/armeabi-v7a/.ninja_log
#	app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/7segment.dir/7segment.c.o
#	app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/buzzer.dir/buzzer.c.o
#	app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/led.dir/led.c.o
#	app/.cxx/cmake/debug/armeabi-v7a/android_gradle_build_targets.stdout.txt
#	app/.cxx/cmake/debug/x86/.ninja_deps
#	app/.cxx/cmake/debug/x86/.ninja_log
#	app/.cxx/cmake/debug/x86/CMakeFiles/7segment.dir/7segment.c.o
#	app/.cxx/cmake/debug/x86/CMakeFiles/buzzer.dir/buzzer.c.o
#	app/.cxx/cmake/debug/x86/CMakeFiles/dotmatrix.dir/dotmatrix.c.o
#	app/.cxx/cmake/debug/x86/CMakeFiles/led.dir/led.c.o
#	app/.cxx/cmake/debug/x86/android_gradle_build_targets.stdout.txt
#	app/src/main/cpp/led.c
#	app/src/main/java/com/quchen/flappycow/Game.java
    @yosebeee
    yosebeee committed Dec 5, 2022
    Configuration menu
    Copy the full SHA
    391ebbb View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2022

  1. 2022-12-08

    @dkim-coder
    dkim-coder committed Dec 8, 2022
    Configuration menu
    Copy the full SHA
    3653c08 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' 

    # Conflicts:
#	.idea/misc.xml
#	app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/7segment.dir/7segment.c.o
#	app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/lcd.dir/lcd.c.o
#	app/.cxx/cmake/debug/armeabi-v7a/android_gradle_build_targets.stdout.txt
    @dkim-coder
    dkim-coder committed Dec 8, 2022
    Configuration menu
    Copy the full SHA
    c9de5bd View commit details
    Browse the repository at this point in the history
Loading