Jinhao
|
224b08a800
|
Merge branch 'qPCR4vir-develop' into develop
|
2016-07-03 21:53:56 +08:00 |
|
Jinhao
|
a55006ef91
|
Merge branch 'develop' of https://github.com/qPCR4vir/nana into qPCR4vir-develop
|
2016-07-03 21:53:36 +08:00 |
|
Jinhao
|
d38c4839bc
|
Merge branch 'listbox-model' into develop
|
2016-07-03 21:24:20 +08:00 |
|
Jinhao
|
8c7051566c
|
optimize binary size
|
2016-07-01 23:43:48 +08:00 |
|
dankan1890
|
72768fd788
|
fix PNG build.
|
2016-06-30 20:46:02 +02:00 |
|
qPCR4vir
|
ddc88e0af0
|
travis test with nana-demo/develop branch
|
2016-06-30 17:54:51 +02:00 |
|
qPCR4vir
|
eb9a31676f
|
Merge remote-tracking branch 'nana_jh/develop' into tests
|
2016-06-30 17:04:04 +02:00 |
|
qPCR4vir
|
bb79dcbefc
|
return optional librarirs first in cmake
|
2016-06-30 16:35:11 +02:00 |
|
qPCR4vir
|
b5706bab17
|
make install only (in travis)
|
2016-06-30 16:05:47 +02:00 |
|
qPCR4vir
|
87d8f692c5
|
cleaning
|
2016-06-30 15:57:41 +02:00 |
|
Jinhao
|
b32afa282c
|
minor change
|
2016-06-28 21:21:47 +08:00 |
|
Jinhao
|
9bb6d1628b
|
Merge branch 'qPCR4vir-tests' into develop
|
2016-06-28 21:08:07 +08:00 |
|
qPCR4vir
|
8b19d0d12e
|
FIX compiler error SPI_GETWHEELSCROLLCHARS not found
|
2016-06-28 14:00:16 +02:00 |
|
qPCR4vir
|
1a0761c59b
|
- cd ../bin
|
2016-06-27 17:00:36 +02:00 |
|
qPCR4vir
|
a6e8d88ae8
|
install -DCMAKE_INSTALL_PREFIX=..
|
2016-06-27 16:59:26 +02:00 |
|
qPCR4vir
|
98ed89c097
|
- cp -v ../nana-demo/Examples ../
|
2016-06-27 16:35:23 +02:00 |
|
qPCR4vir
|
fffa89ea5c
|
- cp -v nana-demo/Examples
|
2016-06-27 16:17:24 +02:00 |
|
qPCR4vir
|
5b74b38b13
|
- mv -v nana-demo/Examples .
|
2016-06-27 16:08:00 +02:00 |
|
qPCR4vir
|
b5822df1ec
|
set the same options !?
|
2016-06-27 15:24:28 +02:00 |
|
qPCR4vir
|
72f950282a
|
make ../nana-demo
|
2016-06-27 14:15:29 +02:00 |
|
qPCR4vir
|
1a1e86fc92
|
build ../nana-demo
|
2016-06-27 13:16:07 +02:00 |
|
qPCR4vir
|
4886dcd840
|
build ../nana_demo
|
2016-06-27 13:10:43 +02:00 |
|
qPCR4vir
|
26a2b5ac63
|
put in ../nana_lib the lib and the includes
|
2016-06-27 13:00:44 +02:00 |
|
qPCR4vir
|
939cc04c67
|
Merge remote-tracking branch 'nana_jh/develop' into tests
|
2016-06-27 11:17:43 +02:00 |
|
Jinhao
|
a8219fe760
|
modifiable mouse wheel scroll step
|
2016-06-27 10:36:08 +08:00 |
|
qPCR4vir
|
234c94aaf4
|
Merge remote-tracking branch 'origin/tests' into tests
|
2016-06-27 01:55:18 +02:00 |
|
qPCR4vir
|
6328ae0cfd
|
no cd ../lib
|
2016-06-27 01:55:05 +02:00 |
|
Ariel Vina-Rodriguez
|
11bfe65044
|
no tabs
|
2016-06-27 01:46:05 +02:00 |
|
qPCR4vir
|
37205f0aa9
|
relative dir
|
2016-06-27 01:37:09 +02:00 |
|
qPCR4vir
|
a68155c7d7
|
Build build demos separately.
|
2016-06-27 01:25:48 +02:00 |
|
qPCR4vir
|
11bd0bcf88
|
remove filesystem_selector
|
2016-06-27 01:24:19 +02:00 |
|
qPCR4vir
|
dbc011a212
|
Merge remote-tracking branch 'nana_jh/develop' into tests
|
2016-06-27 01:22:55 +02:00 |
|
qPCR4vir
|
105ecdbc1a
|
Merge remote-tracking branch 'nana_jh/develop' into tests
|
2016-06-27 01:12:46 +02:00 |
|
Jinhao
|
3cf10ef940
|
fix verbose_preprocessor
|
2016-06-27 07:07:50 +08:00 |
|
Jinhao
|
1845b41019
|
remove filesystem_selector
|
2016-06-27 00:35:04 +08:00 |
|
qPCR4vir
|
bb922fa683
|
Merge remote-tracking branch 'nana_jh/develop' into tests
|
2016-06-26 18:04:07 +02:00 |
|
Ariel Vina-Rodriguez
|
24c63e020d
|
Update README.md
|
2016-06-26 13:55:33 +02:00 |
|
Jinhao
|
c65247b413
|
Merge branch 'qPCR4vir-tests' into develop
|
2016-06-26 19:04:56 +08:00 |
|
qPCR4vir
|
1eb1ac3a28
|
don't use VS2013 filesytem
|
2016-06-26 00:30:10 +02:00 |
|
qPCR4vir
|
a0e6a36e37
|
Merge remote-tracking branch 'nana_jh/develop' into tests
|
2016-06-26 00:28:17 +02:00 |
|
Jinhao
|
1aca8c9506
|
restore travis config
|
2016-06-26 06:01:21 +08:00 |
|
Jinhao
|
59922e7b78
|
remove debug information
|
2016-06-26 05:33:38 +08:00 |
|
qPCR4vir
|
265209c704
|
Merge remote-tracking branch 'nana_jh/develop' into tests
|
2016-06-25 20:44:26 +02:00 |
|
qPCR4vir
|
5d094e2864
|
20 of 55 failed, why sometimes- threading and thread-pool too
|
2016-06-25 20:35:51 +02:00 |
|
qPCR4vir
|
e134f34930
|
18 of 55 failed, sometimes- threading and thread-pool too
|
2016-06-25 20:27:05 +02:00 |
|
qPCR4vir
|
3dd9c7738e
|
3 more. 16 of 55 failed, 2 sometimes- threading and thread-pool
|
2016-06-25 20:16:52 +02:00 |
|
Jinhao
|
1a85a0a061
|
Merge branch 'qPCR4vir-dev_nana_fs' into develop
|
2016-06-26 01:59:08 +08:00 |
|
qPCR4vir
|
8596da0587
|
16 of 52 don't pass
|
2016-06-25 19:52:59 +02:00 |
|
qPCR4vir
|
cb33acf2c3
|
13 of 52 don't pass
|
2016-06-25 19:34:59 +02:00 |
|
Jinhao
|
d74cfb3d6f
|
Merge branch 'beru-hotfix-1.3' into hotfix-1.3
|
2016-06-26 01:15:41 +08:00 |
|