Martin Diehl
|
718f3841f8
|
Merge branch 'cmake' into development
|
2017-04-19 21:48:50 +02:00 |
|
Martin Diehl
|
e65de75814
|
fixed pas (was still code)
|
2017-04-19 15:10:43 +02:00 |
|
Martin Diehl
|
b2897210f9
|
source DAMASK_env.sh was missing
|
2017-04-19 10:50:07 +02:00 |
|
Martin Diehl
|
cbaec8bcb9
|
was in wrong directory
|
2017-04-19 09:35:19 +02:00 |
|
Test User
|
c97226a75f
|
[skip ci] updated version information after successful test of v2.0.1-477-gf0f602e
|
2017-04-19 06:40:49 +02:00 |
|
Martin Diehl
|
f0f602e1f5
|
confused merging strategies
|
2017-04-18 15:18:23 +02:00 |
|
Martin Diehl
|
bffccca628
|
address changed a while ago
|
2017-04-18 15:17:37 +02:00 |
|
Test User
|
2e173fbddd
|
[skip ci] Merge branch 'master' into development
|
2017-04-18 14:42:03 +02:00 |
|
Test User
|
7986ae66bc
|
Merge commit 'v2.0.1-473-gc5c2c19'
|
2017-04-18 14:41:59 +02:00 |
|
Test User
|
c5c2c19a2f
|
[skip ci] updated version information after successful test of v2.0.1-472-g1768d8f
|
2017-04-18 14:41:58 +02:00 |
|
Martin Diehl
|
7cb2669648
|
sytaycheck only target was not working
|
2017-04-18 07:38:36 +02:00 |
|
Martin Diehl
|
d4c1482690
|
syntax check not for debug
|
2017-04-18 07:14:55 +02:00 |
|
Martin Diehl
|
2c28d059b5
|
Merge branch 'development' into PRIVATEasSubmodule
|
2017-04-18 05:42:27 +02:00 |
|
Martin Diehl
|
1768d8f103
|
update of VERSION file should not trigger new GitLabCI
|
2017-04-18 05:37:36 +02:00 |
|
Martin Diehl
|
32722a3d77
|
adopting to new installation and test
|
2017-04-18 05:29:00 +02:00 |
|
Test User
|
9a18d994a5
|
Merge branch 'master' into development
|
2017-04-17 14:56:25 +02:00 |
|
Test User
|
cd04a9f75d
|
Merge commit 'v2.0.1-467-g1dd36c6'
|
2017-04-17 14:56:22 +02:00 |
|
Test User
|
1dd36c6e28
|
[skip ci] updated version information after successful test of v2.0.1-466-gde48d54
|
2017-04-17 14:56:22 +02:00 |
|
Martin Diehl
|
c58dd6279d
|
Merge branch 'development' into PRIVATEasSubmodule
|
2017-04-17 05:51:04 +02:00 |
|
Martin Diehl
|
de48d54201
|
conflict occured after manual merge+push to master
|
2017-04-17 05:50:41 +02:00 |
|
Martin Diehl
|
a5f8c5ba32
|
Merge branch 'development' into cmake
|
2017-04-15 16:17:50 +02:00 |
|
Martin Diehl
|
b1248cfa77
|
simplified
|
2017-04-15 12:59:46 +02:00 |
|
Martin Diehl
|
a52010dff2
|
error during merge
|
2017-04-15 12:58:13 +02:00 |
|
Martin Diehl
|
8bee117401
|
corrected path
|
2017-04-15 12:55:13 +02:00 |
|
Martin Diehl
|
1344905c7e
|
typo
|
2017-04-15 12:45:11 +02:00 |
|
Martin Diehl
|
65985e3dd7
|
correct escape
|
2017-04-15 12:44:02 +02:00 |
|
Martin Diehl
|
d2b6fdd453
|
corrected path
|
2017-04-15 12:33:52 +02:00 |
|
Martin Diehl
|
cb4a1a0f81
|
Merge branch 'development' into PRIVATEasSubmodule
|
2017-04-15 12:27:13 +02:00 |
|
Martin Diehl
|
b792a5e22e
|
Merge branch 'development'
|
2017-04-15 12:08:37 +02:00 |
|
Martin Diehl
|
62dd57313e
|
queue for runners to retain order
|
2017-04-15 12:07:59 +02:00 |
|
Philip Eisenlohr
|
2b21d72c6b
|
Merge remote-tracking branch 'origin/development' into development
|
2017-04-14 15:07:52 -04:00 |
|
Philip Eisenlohr
|
c34716a0da
|
modern form of croaking, added '*draw_automatic' as final output
|
2017-04-14 15:07:43 -04:00 |
|
Martin Diehl
|
a46107ba7f
|
pull needed to avoid conflicts
|
2017-04-14 09:16:21 +02:00 |
|
Test User
|
b3066122dc
|
[skip ci] updated version information after successful test of v2.0.1-455-gae3a518
|
2017-04-14 08:46:11 +02:00 |
|
Philip Eisenlohr
|
4ffca8f0dc
|
check for erroneous total phase fraction
|
2017-04-13 19:01:42 -04:00 |
|
Philip Eisenlohr
|
d1c2e2114d
|
switch auto drawing back on at end of pipeline
|
2017-04-13 19:00:19 -04:00 |
|
Philip Eisenlohr
|
6114541dba
|
try unlimited heap and stack first
|
2017-04-13 18:59:52 -04:00 |
|
Martin Diehl
|
ae3a5187c0
|
syntax error
|
2017-04-13 21:35:46 +02:00 |
|
Martin Diehl
|
a2bbf1faaf
|
Merge branch 'development' into PRIVATEasSubmodule
|
2017-04-13 19:59:33 +02:00 |
|
Martin Diehl
|
45f192be09
|
safe in case of failing prepareAll
|
2017-04-13 19:56:52 +02:00 |
|
Martin Diehl
|
67d9fb386b
|
in-line code for better readability
|
2017-04-13 19:42:59 +02:00 |
|
Martin Diehl
|
b5275ad7b9
|
adjusted handling of PRIVATE for testing
|
2017-04-13 16:24:55 +02:00 |
|
Martin Diehl
|
f8ae4b8f20
|
Merge branch 'development' into PRIVATEasSubmodule
|
2017-04-13 16:17:17 +02:00 |
|
Martin Diehl
|
e5eea4caec
|
finished debugging, master and release will never be tested
|
2017-04-13 16:12:48 +02:00 |
|
Test User
|
2f77f086b5
|
Merge branch 'master' into development
|
2017-04-13 13:27:41 +02:00 |
|
Test User
|
d595ad5616
|
[skip ci] updated version information after successful test of v2.0.1-449-g3898995
|
2017-04-13 13:27:39 +02:00 |
|
Test User
|
3898995c74
|
Merge branch 'master' into development
|
2017-04-13 13:23:22 +02:00 |
|
Test User
|
73ce3c01b7
|
[skip ci] updated version information after successful test of v2.0.1-447-gbf7b4f2
|
2017-04-13 13:23:07 +02:00 |
|
Martin Diehl
|
bf7b4f2af5
|
debugging update procedure2
|
2017-04-13 13:21:38 +02:00 |
|
Martin Diehl
|
f1c6524c34
|
debugging update procedure
|
2017-04-13 13:07:38 +02:00 |