Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
onlyoffice_core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
onlyoffice_core
Commits
529f028e
Commit
529f028e
authored
Jun 30, 2016
by
Alexander Trofimov
Committed by
GitHub
Jun 30, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10 from ONLYOFFICE/release/v4.0
Release/v4.0
parents
b329c378
66550e5a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
.travis.yml
.travis.yml
+1
-0
LICENSE.txt
LICENSE.txt
+1
-1
X2tConverter/build/Qt/X2tConverter.pro
X2tConverter/build/Qt/X2tConverter.pro
+2
-2
No files found.
.travis.yml
0 → 100644
View file @
529f028e
language
:
cpp
\ No newline at end of file
LICENSE.txt
View file @
529f028e
...
@@ -658,4 +658,4 @@ specific requirements.
...
@@ -658,4 +658,4 @@ specific requirements.
You should also get your employer (if you work as a programmer) or school,
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
For more information on this, and how to apply and follow the GNU AGPL, see
<http://www.gnu.org/licenses/>.
<http://www.gnu.org/licenses/>.
\ No newline at end of file
X2tConverter/build/Qt/X2tConverter.pro
View file @
529f028e
...
@@ -174,8 +174,8 @@ CONFIG(debug, debug|release) {
...
@@ -174,8 +174,8 @@ CONFIG(debug, debug|release) {
linux
-
g
++
|
linux
-
g
++-
64
|
linux
-
g
++-
32
:
contains
(
QMAKE_HOST
.
arch
,
x86_64
)
:
{
linux
-
g
++
|
linux
-
g
++-
64
|
linux
-
g
++-
32
:
contains
(
QMAKE_HOST
.
arch
,
x86_64
)
:
{
message
(
linuX
)
message
(
linuX
)
LIBS
+=
$$
DESTINATION_BIN_PATH
/
icu
/
linux_64
/
libicuuc
.
so
.
55
LIBS
+=
/
usr
/
local
/
lib
/
libicuuc
.
so
.
55
LIBS
+=
$$
DESTINATION_BIN_PATH
/
icu
/
linux_64
/
libicudata
.
so
.
55
LIBS
+=
/
usr
/
local
/
lib
/
libicudata
.
so
.
55
DESTINATION_SDK_PATH
=
$$
DESTINATION_SDK_PATH
/
linux_64
DESTINATION_SDK_PATH
=
$$
DESTINATION_SDK_PATH
/
linux_64
DESTINATION_BIN_PATH
=
$$
DESTINATION_BIN_PATH
/
linux
DESTINATION_BIN_PATH
=
$$
DESTINATION_BIN_PATH
/
linux
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment