Diffusion Buho Task and Note Keeper 5da6991f9881

solve merge issues
5da6991f9881
Actions

Authored by camiloh on Jul 14 2018, 2:55 AM.

Description

solve merge issues

Details

Committed
camilohJul 14 2018, 2:55 AM
Parents
R1008:f7bda22c8c56: more work on links collector
Branches
Unknown
Tags
Unknown

Changes (7)

PathPackages
Pandroid/gradle.properties
Copied to android/gradle.properties~
Pandroid/gradle.properties~
Copied from android/gradle.properties
Pandroid/local.properties
Copied to android/local.properties~
Pandroid/local.properties~
Copied from android/local.properties
Psrc/linker.cpp
Copied to src/linker.cpp.autosave
Psrc/linker.cpp.autosave
Copied from src/linker.cpp
Msrc/linker.h

R1008:5da6991f9881

View Options

android/gradle.properties

Loading...
View Options

android/gradle.properties~

Loading...
View Options

android/local.properties

Loading...
View Options

android/local.properties~

Loading...
View Options

src/linker.cpp

Loading...
View Options

src/linker.cpp.autosave

Loading...
View Options

src/linker.h

Loading...