diff options
author | flow <thiagodonato300@gmail.com> | 2022-03-24 18:24:51 -0300 |
---|---|---|
committer | flow <thiagodonato300@gmail.com> | 2022-03-24 18:24:51 -0300 |
commit | e13ca94061c7fdfec9bd18b982b56a8d5a1f80b0 (patch) | |
tree | c04986ab61f789e4a01b854c374dc8ee15f4dffa /libraries/rainbow/include/rainbow_config.h | |
parent | da43ed8ce1d804fe20c44788577a0387a698ed6e (diff) | |
parent | 92f3154e8f7c1421541a00ae7cf57f188cfe46a5 (diff) | |
download | PrismLauncher-e13ca94061c7fdfec9bd18b982b56a8d5a1f80b0.tar.gz PrismLauncher-e13ca94061c7fdfec9bd18b982b56a8d5a1f80b0.tar.bz2 PrismLauncher-e13ca94061c7fdfec9bd18b982b56a8d5a1f80b0.zip |
chore: resolve conflicts and merge upstream
Diffstat (limited to 'libraries/rainbow/include/rainbow_config.h')
-rw-r--r-- | libraries/rainbow/include/rainbow_config.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/libraries/rainbow/include/rainbow_config.h b/libraries/rainbow/include/rainbow_config.h deleted file mode 100644 index 52cc7388..00000000 --- a/libraries/rainbow/include/rainbow_config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2013-2021 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include <QtCore/QtGlobal> - -#ifdef RAINBOW_STATIC - #define RAINBOW_EXPORT -#else - #ifdef RAINBOW_LIBRARY - #define RAINBOW_EXPORT Q_DECL_EXPORT - #else - #define RAINBOW_EXPORT Q_DECL_IMPORT - #endif -#endif
\ No newline at end of file |