Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

nheko
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

bca4d7ee

Verified Commit bca4d7ee authored 5 years ago by Joe Donofry

Downloads
- Plain Diff

Merge in master

parents 9671b1c0 1b34b53a

No related branches found

No related tags found

No related merge requests found

Changes 19

Hide whitespace changes

Inline Side-by-side

Showing

.ci/format.sh 7 additions, 6 deletions

.ci/format.sh
.ci/install.sh 17 additions, 12 deletions

.ci/install.sh
.ci/linux/deploy.sh 21 additions, 10 deletions

.ci/linux/deploy.sh
.ci/macos/deploy.sh 18 additions, 17 deletions

.ci/macos/deploy.sh
.ci/script.sh 15 additions, 12 deletions

.ci/script.sh
.gitignore 3 additions, 0 deletions

.gitignore
CHANGELOG.md 22 additions, 0 deletions

CHANGELOG.md
CMakeLists.txt 3 additions, 2 deletions

CMakeLists.txt
COPYING 0 additions, 0 deletions

COPYING
README.md 4 additions, 3 deletions

README.md
appveyor.yml 12 additions, 9 deletions

appveyor.yml
deps/CMakeLists.txt 4 additions, 3 deletions

deps/CMakeLists.txt
deps/cmake/Boost.cmake 1 addition, 1 deletion

deps/cmake/Boost.cmake
deps/cmake/MatrixClient.cmake 7 additions, 0 deletions

deps/cmake/MatrixClient.cmake
resources/nheko.appdata.xml 27 additions, 2 deletions

resources/nheko.appdata.xml
scripts/archive.sh 3 additions, 1 deletion

scripts/archive.sh
scripts/generate_icns.sh 14 additions, 12 deletions

scripts/generate_icns.sh
src/Config.h 6 additions, 3 deletions

src/Config.h
src/Utils.cpp 2 additions, 58 deletions

src/Utils.cpp

with 186 additions and 151 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment