tokkee.org

Code

projects / sysdb.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 102de67 5610952)

author	Sebastian Harl <sh@tokkee.org>
	Sun, 1 Dec 2013 16:34:48 +0000 (17:34 +0100)
committer	Sebastian Harl <sh@tokkee.org>
	Sun, 1 Dec 2013 16:34:48 +0000 (17:34 +0100)
commit	2e2e989712ec5991526b3aaeec011440adb5bf7e
tree	327081f7ca1196532d2546e5a1a303e9bf8c18f1	tree \| snapshot
parent	102de67cdf77fa5819f61ba43111429d8d9a6c5b	commit \| diff
parent	5610952da2f4190573bc10467fcf249a9e7eff4b	commit \| diff

Merged branch 'master' of git://git.tokkee.org/sysdb.

Conflicts:
t/Makefile.am
t/libsysdb_test.c
t/libsysdb_test.h

t/Makefile.am	diff1 \|	diff2 \|	blob \| history
t/libsysdb_test.c	diff1 \|	diff2 \|	blob \| history
t/libsysdb_test.h	diff1 \|	diff2 \|	blob \| history

System DataBase (SysDB)