git-annex-gpl - git-annex without the AGPL

	Commit message (Collapse)	Author	Age
*	partial and incomplete automatic merging in direct mode	Joey Hess	2012-12-18
\| \| \| \|	Handles our file right, but not theirs.
*	unused	Joey Hess	2012-12-18
\|
*	update	Joey Hess	2012-12-18
\|
*	direct mode merging works!	Joey Hess	2012-12-18
\| \| \| \| \|	Automatic merge resoltion code needs to be fixed to preserve objects from direct mode files.
*	Merge branch 'master' into desymlink	Joey Hess	2012-12-18
\|\
\| *	vicfg: Quote filename. Closes: #696193	Joey Hess	2012-12-18
\| \|
\| *	new autobuilder	Joey Hess	2012-12-17
\| \|
\| *	blog for the day	Joey Hess	2012-12-17
\| \|
* \|	Merge branch 'master' into desymlink	Joey Hess	2012-12-17
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: debian/changelog doc/design/assistant/desymlink.mdwn
\| *	close fixed OSX issues	Joey Hess	2012-12-17
\| \|
\| *	OSX Mountian Lion builds now available	Joey Hess	2012-12-17
\| \|
\| *	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2012-12-17
\| \|\
\| * \|	move tip from forum to tips	Joey Hess	2012-12-17
\| \| \|
\| \| *	Added a comment	http://joeyh.name/	2012-12-17
\| \|/
\| *	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2012-12-17
\| \|\
\| \| *	Added a comment	http://joeyh.name/	2012-12-17
\| \| \|
\| \| *	Added a comment	http://joeyh.name/	2012-12-17
\| \| \|
\| * \|	back to $SHELL for OSX app	Joey Hess	2012-12-17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is safe because we no longer mess with LD_PRELOAD equivilants. Since the linux standalone bundle still does, it continues to run sh.
\| \| *	Added a comment	http://joeyh.name/	2012-12-17
\| \| \|
\| \| *	Added a comment: OSX troubles	https://www.google.com/accounts/o8/id?id=AItOawmYiJgOvC4IDYkr2KIjMlfVD9r_1Sij_jY	2012-12-17
\| \|/
\| *	(no commit message)	https://www.google.com/accounts/o8/id?id=AItOawkfHTPsiAcHEEN7Xl7WxiZmYq-vX7azxFY	2012-12-17
\| \|
\| *	removing archive pages, which broke the blog and I don't want	Joey Hess	2012-12-16
\| \|
\| *	Added a comment	https://www.google.com/accounts/o8/id?id=AItOawkfHTPsiAcHEEN7Xl7WxiZmYq-vX7azxFY	2012-12-16
\| \|
\| *	Added a comment: Thanks!	andy	2012-12-16
\| \|
\| *	Added a comment	http://edheil.wordpress.com/	2012-12-16
\| \|
\| *	Added a comment	http://edheil.wordpress.com/	2012-12-16
\| \|
\| *	(no commit message)	andy	2012-12-15
\| \|
\| *	(no commit message)	Steve	2012-12-15
\| \|
\| *	calendar update	admin	2012-12-15
\| \|
\| *	Added a comment	http://edheil.wordpress.com/	2012-12-15
\| \|
\| *	move away 2 old comments that I think are now addressed in the install ↵	Joey Hess	2012-12-14
\| \| \| \| \| \| \| \|	instructions
\| *	cabal: add missing depend to 'test-suite', guard against 'kqueue' on linux	Sergei Trofimovich	2012-12-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes the following test failure: Preprocessing test suite 'test' for git-annex-3.20121211... Remote/Git.hs:42:8: Could not find module `Control.Concurrent.MSampleVar' It is a member of the hidden package `SafeSemaphore-0.9.0'. Perhaps you need to add `SafeSemaphore' to the build-depends in your .cabal file. Use -v to see a list of the files searched for. Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
\| *	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2012-12-14
\| \|\
\| * \|	blog for the day	Joey Hess	2012-12-14
\| \| \|
\| \| *	Added a comment	http://joeyh.name/	2012-12-14
\| \|/
\| *	kqueue: Fix bug that made broken symlinks not be noticed.	Joey Hess	2012-12-14
\| \|
\| *	move thirdparty program installation for standalone bundle into haskell program	Joey Hess	2012-12-14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows it to use Build.SysConfig to always install the programs configure detected. Amoung other fixes, this ensures the right uuid generator and checksum programs are installed. I also cleaned up the handling of lsof's path; configure now checks for it in PATH, but falls back to looking for it in sbin directories.
\| *	quiet shell error message	Joey Hess	2012-12-14
\| \|
\| *	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2012-12-14
\| \|\
\| * \|	typo	Joey Hess	2012-12-14
\| \| \|
\| \| *	Added a comment	http://joeyh.name/	2012-12-14
\| \|/
\| *	Merge branch 'master' of ssh://git-annex.branchable.com	Joey Hess	2012-12-14
\| \|\
\| * \|	add calendar sidebar	Joey Hess	2012-12-14
\| \| \|
\| \| *	(no commit message)	https://www.google.com/accounts/o8/id?id=AItOawkZktNHFhxC1kYA9KKdKpYJO4clq9WDsjE	2012-12-14
\| \| \|
\| \| *	Added a comment: OS/X daily 2012-12-13	https://www.google.com/accounts/o8/id?id=AItOawkfHTPsiAcHEEN7Xl7WxiZmYq-vX7azxFY	2012-12-14
\| \| \|
\| \| *	escape ^	http://edward.myopenid.com/	2012-12-14
\| \| \|
\| \| *	Added a comment	http://joeyh.name/	2012-12-13
\| \|/
\| *	Added a comment	http://edheil.wordpress.com/	2012-12-13
\| \|
\| *	(no commit message)	http://edheil.wordpress.com/	2012-12-13
\| \|
\| *	Added a comment	http://edheil.wordpress.com/	2012-12-13
\| \|