projects / clearscm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c44e2ba 5aa0e96)
Merge branch 'master' of /opt/git/clearscm
authorAndrew DeFaria <Andrew@DeFaria.com>
Tue, 6 Aug 2013 15:15:56 +0000 (08:15 -0700)
committerAndrew DeFaria <Andrew@DeFaria.com>
Tue, 6 Aug 2013 15:15:56 +0000 (08:15 -0700)
Conflicts:
clearadm/var/run/clearagent.pl.pid
clearadm/var/run/cleartasks.pl.pid


Trivial merge
ClearSCM Source Repository. Note parts of this repo are under GPL. Other parts are copyright ClearSCM, Inc.