Lynix
|
dea48a289d
|
Merge branch 'master' into NDK
Conflicts:
include/Nazara/Core/ConditionVariable.hpp
Former-commit-id: 84320f0a55ae9d8f80ff5211d30d99184c7b4213
|
2015-08-21 12:49:05 +02:00 |
|
Lynix
|
656290d089
|
Core/Bitset: Add comparison operators
Former-commit-id: 7ca04f36fa001f322182c5e9457127f05432d373
|
2015-05-19 14:31:04 +02:00 |
|
Lynix
|
54f954208e
|
Script/Features: Update TaskScheduler
Former-commit-id: bb2659b892103880402cf7443847fa1cb66a19c2
|
2015-05-19 14:14:22 +02:00 |
|
Lynix
|
90e4a1ca52
|
Core/HardwareInfo: Added GetTotalMemory
Former-commit-id: 71289723115161dd253ccb65c1c91af65344c678
|
2015-05-19 14:13:48 +02:00 |
|
Lynix
|
95cb02c41c
|
(Features) Fixed typo
Former-commit-id: fa5a551d876f513ec941af0069d8997c8aee7940
|
2015-03-18 20:32:14 +01:00 |
|
Lynix
|
12c238ddae
|
Added feature page generation
Former-commit-id: 9d1b3db59f4d13ceb69212c289925c198eb14bc6
|
2015-03-18 17:11:24 +01:00 |