1
0
Fork 0
arangodb/lib/Basics
Michael Hackstein 9f3479f5b6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	utils/Makefile.files
2014-01-10 17:41:52 +01:00
..
AssociativeArray.h Windows warnings 2013-10-29 10:09:12 +01:00
Common.h updated disclaimer 2013-03-13 17:03:18 +01:00
ConditionLocker.cpp Fix documentation of timeout unit. 2013-12-19 12:16:30 +01:00
ConditionLocker.h Fix documentation of timeout unit. 2013-12-19 12:16:30 +01:00
ConditionVariable.cpp Fix documentation of timeout unit. 2013-12-19 12:16:30 +01:00
ConditionVariable.h Fix documentation of timeout unit. 2013-12-19 12:16:30 +01:00
Dictionary.h updated disclaimer 2013-03-13 17:03:18 +01:00
Exceptions.cpp updated disclaimer 2013-03-13 17:03:18 +01:00
Exceptions.h updated disclaimer 2013-03-13 17:03:18 +01:00
FileUtils.cpp removed second logger implementation 2013-10-30 00:38:25 +01:00
FileUtils.h fixed file uploads 2013-03-24 18:13:13 +01:00
Functor.h updated disclaimer 2013-03-13 17:03:18 +01:00
InitialiseBasics.cpp removed second logger implementation 2013-10-30 00:38:25 +01:00
InitialiseBasics.h updated disclaimer 2013-03-13 17:03:18 +01:00
JsonHelper.cpp moved some collection parameters around 2014-01-07 11:02:49 +01:00
JsonHelper.h moved some collection parameters around 2014-01-07 11:02:49 +01:00
LibraryLoader.cpp removed second logger implementation 2013-10-30 00:38:25 +01:00
LibraryLoader.h removed second logger implementation 2013-10-30 00:38:25 +01:00
Mutex.cpp updated disclaimer 2013-03-13 17:03:18 +01:00
Mutex.h updated disclaimer 2013-03-13 17:03:18 +01:00
MutexLocker.cpp updated disclaimer 2013-03-13 17:03:18 +01:00
MutexLocker.h updated disclaimer 2013-03-13 17:03:18 +01:00
Nonce.cpp removed second logger implementation 2013-10-30 00:38:25 +01:00
Nonce.h updated disclaimer 2013-03-13 17:03:18 +01:00
ProgramOptions.cpp removed second logger implementation 2013-10-30 00:38:25 +01:00
ProgramOptions.h updated disclaimer 2013-03-13 17:03:18 +01:00
ProgramOptionsDescription.cpp don't call getenv in loop 2013-08-29 22:08:10 +02:00
ProgramOptionsDescription.h updated disclaimer 2013-03-13 17:03:18 +01:00
RandomGenerator.cpp removed second logger implementation 2013-10-30 00:38:25 +01:00
RandomGenerator.h updated disclaimer 2013-03-13 17:03:18 +01:00
RandomHeap.h updated disclaimer 2013-03-13 17:03:18 +01:00
ReadLocker.cpp fixed assertion 2013-07-23 10:01:20 +02:00
ReadLocker.h updated disclaimer 2013-03-13 17:03:18 +01:00
ReadUnlocker.cpp updated disclaimer 2013-03-13 17:03:18 +01:00
ReadUnlocker.h updated disclaimer 2013-03-13 17:03:18 +01:00
ReadWriteLock.cpp updated disclaimer 2013-03-13 17:03:18 +01:00
ReadWriteLock.h updated disclaimer 2013-03-13 17:03:18 +01:00
StringBuffer.h fixed some Windows warnings 2013-10-08 12:39:47 +02:00
StringUtils.cpp merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
StringUtils.h fixed a few type issues, updated TODOs 2013-06-07 11:31:42 +02:00
Thread.cpp merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Thread.h fixed thread shutdown (double detach) 2013-10-29 22:29:25 +01:00
Timing.cpp updated disclaimer 2013-03-13 17:03:18 +01:00
Timing.h updated disclaimer 2013-03-13 17:03:18 +01:00
Utf8Helper.cpp removed second logger implementation 2013-10-30 00:38:25 +01:00
Utf8Helper.h fixed comment 2013-07-11 17:51:15 +02:00
WriteLocker.cpp updated disclaimer 2013-03-13 17:03:18 +01:00
WriteLocker.h updated disclaimer 2013-03-13 17:03:18 +01:00
WriteUnlocker.cpp updated disclaimer 2013-03-13 17:03:18 +01:00
WriteUnlocker.h updated disclaimer 2013-03-13 17:03:18 +01:00
delete_object.h updated disclaimer 2013-03-13 17:03:18 +01:00
safe_cast.h updated disclaimer 2013-03-13 17:03:18 +01:00
ssl-helper.cpp updated disclaimer 2013-03-13 17:03:18 +01:00
ssl-helper.h updated disclaimer 2013-03-13 17:03:18 +01:00