diff options
| author | Petr Mrázek <peterix@gmail.com> | 2019-09-26 20:08:47 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2019-09-26 20:08:47 +0200 |
| commit | ffe84d6ec76c058e94be1a07e8b3487225f43116 (patch) | |
| tree | fda2b87b02e900cbf11011cbf3d26229580b8eea | |
| parent | 19015de25867d47cf39bc761cf41a76f14898280 (diff) | |
| download | MultiMC-ffe84d6ec76c058e94be1a07e8b3487225f43116.tar MultiMC-ffe84d6ec76c058e94be1a07e8b3487225f43116.tar.gz MultiMC-ffe84d6ec76c058e94be1a07e8b3487225f43116.tar.lz MultiMC-ffe84d6ec76c058e94be1a07e8b3487225f43116.tar.xz MultiMC-ffe84d6ec76c058e94be1a07e8b3487225f43116.zip | |
NOISSUE remove some dead things
| -rw-r--r-- | .arcconfig | 5 | ||||
| -rw-r--r-- | .clang-format | 25 | ||||
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | .travis.yml | 38 |
4 files changed, 2 insertions, 71 deletions
diff --git a/.arcconfig b/.arcconfig deleted file mode 100644 index ab5cbe89..00000000 --- a/.arcconfig +++ /dev/null @@ -1,5 +0,0 @@ -{ - "project_id": "MultiMC5", - "conduit_uri": "http://ph.multimc.org" -} - diff --git a/.clang-format b/.clang-format deleted file mode 100644 index f4732803..00000000 --- a/.clang-format +++ /dev/null @@ -1,25 +0,0 @@ -UseTab: false -IndentWidth: 4 -TabWidth: 4 -ConstructorInitializerIndentWidth: 4 -AccessModifierOffset: -4 -IndentCaseLabels: false -IndentFunctionDeclarationAfterType: false -NamespaceIndentation: None - -BreakBeforeBraces: Allman -AllowShortIfStatementsOnASingleLine: false -AllowShortFunctionsOnASingleLine: None -ColumnLimit: 160 -MaxEmptyLinesToKeep: 1 - -Standard: Cpp11 -Cpp11BracedListStyle: true - -SpacesInParentheses: false -SpaceInEmptyParentheses: false -SpacesInCStyleCastParentheses: false -SpaceAfterControlStatementKeyword: true - -AlignTrailingComments: true -SpacesBeforeTrailingComments: 1 @@ -1,5 +1,5 @@ Thumbs.db -.kdev4 +*.kdev4 .user .directory resources/CMakeFiles @@ -9,8 +9,7 @@ resources/MultiMCLauncher.jar html/ # Project Files -MultiMC5.kdev4 -MultiMC.pro.user +*.pro.user CMakeLists.txt.user CMakeLists.txt.user.* /.project diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 19f39c2f..00000000 --- a/.travis.yml +++ /dev/null @@ -1,38 +0,0 @@ -# General set up -language: cpp -cache: apt - -matrix: - include: - - os: linux - dist: precise - sudo: required - compiler: gcc - env: TRAVIS_DIST=precise QT_VERSION=5.4.2 - - os: linux - dist: precise - sudo: required - compiler: gcc - env: TRAVIS_DIST=precise QT_VERSION=5.6.2 - - os: linux - dist: trusty - sudo: required - compiler: gcc - env: TRAVIS_DIST=trusty QT_VERSION=5.4.2 - - os: linux - dist: trusty - sudo: required - compiler: gcc - env: TRAVIS_DIST=trusty QT_VERSION=5.6.2 - -# Install dependencies -install: - - source travis/prepare.sh # installs qt and cmake. need to source because some env vars are set from there - -# Actual work -before_script: - - mkdir build - - cd build - - cmake -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH .. -script: - - make -j4 && make test ARGS="-V" |