Merge commit 'origin/sqlite_error' into safemerge
commit354aa8752aed72c8693ad1311300d915a531fdc9
authorSverre Rabbelier <alturin@gmail.com>
Sat, 19 Jan 2008 23:58:35 +0000 (20 00:58 +0100)
committerSverre Rabbelier <alturin@gmail.com>
Sat, 19 Jan 2008 23:58:35 +0000 (20 00:58 +0100)
tree6491360a9e6845e14655c886bd999319a794f612
parentb66aa60dbe0b2eb3f8e4579ad0fee278f8e3f3b6
parente54f8590dfdd834b65889653fa5733bb9ac70284
Merge commit 'origin/sqlite_error' into safemerge
UnsignedByte/Resource/SavableManager.cpp
UnsignedByte/Resource/SqliteMgr.cpp
UnsignedByte/include/SavableManager.h