BranchCommit messageAuthorAge
masterMerge in local workChristopher James Halse Rogers14 years
AgeCommit messageAuthorFilesLines
2007-07-14Merge in local workHEADmasterChristopher James Halse Rogers1-0/+0
2007-07-14Merge ../../libcompizconfigChristopher James Halse Rogers35-0/+11320
2007-07-14Really resolve all the conflictsChristopher James Halse Rogers1-27/+1
2007-07-14Resolve merge conflicts for XDG work.Christopher James Halse Rogers14-5300/+6045
2007-07-11Added missing free's.   Dennis Kasprzyk2-2/+18
2007-07-11Use exclusive file locks only for write operations.Dennis Kasprzyk1-5/+11
2007-07-11Fixed missing return value check.Danny Baumann1-3/+4
2007-07-10Revert "Use flock for file locking. (seams to be more stable)"Dennis Kasprzyk1-3/+13
2007-07-10Use flock for file locking. (seams to be more stable)Dennis Kasprzyk1-13/+3
2007-07-10Merge branch 'master' of git+ssh:// Kasprzyk3-14/+52