Joey Hess 85d17a698d Merge branch 'master' into newchunks ... Conflicts: doc/design/assistant/chunks.mdwn		2014-07-27 12:24:03 -04:00
..
Android
android
assistant	add konqueror screenshot	2014-07-21 15:34:13 -04:00
automatic_conflict_resolution
backends	promote comment to todo	2014-07-10 16:27:12 -04:00
bare_repositories
bugs	added output of ls -lb in git directory to show that the file is not added to the annex	2014-07-26 16:50:32 +00:00
coding_style	Added a comment	2014-07-10 20:24:04 +00:00
contact
copies
design	Merge branch 'master' into newchunks	2014-07-27 12:24:03 -04:00
devblog	devblog	2014-07-26 20:51:58 -04:00
direct_mode	Added a comment	2014-07-16 17:51:28 +00:00
download
ekg
encryption
footer
forum		2014-07-23 23:38:55 +00:00
how_it_works
install	belated thanks to Kevin McKenzie for hosting the OSX autobuilder	2014-07-14 16:07:35 -04:00
internals	use same hash directories for chunked key as are used for its parent	2014-07-25 16:09:23 -04:00
license
links
metadata
news	add news item for git-annex 5.20140717	2014-07-17 11:53:03 -04:00
not
polls
preferred_content		2014-07-15 06:13:10 +00:00
special_remotes	update does for chunking	2014-07-26 23:39:51 -04:00
sync
templates
testimonials
tips	update does for chunking	2014-07-26 23:39:51 -04:00
todo		2014-07-24 12:31:31 +00:00
upgrades
use_case
users
videos
walkthrough	add a note about direct mode	2014-07-25 07:57:21 +00:00
Android.mdwn
assistant.mdwn
automatic_conflict_resolution.mdwn
backends.mdwn	mention SKEIN*E variants	2014-07-16 13:31:01 -04:00
bare_repositories.mdwn
bugs.mdwn
builds.mdwn	android version	2014-07-07 14:27:40 -04:00
chunking.mdwn	update does for chunking	2014-07-26 23:39:51 -04:00
coding_style.mdwn
comments.mdwn
contact.mdwn
contribute.mdwn
copies.mdwn
design.mdwn
devblog.mdwn
direct_mode.mdwn
distributed_version_control.mdwn
download.mdwn
ekg.mdwn
encryption.mdwn	fix typos.	2014-07-19 23:25:42 +01:00
favicon.ico
feeds.mdwn
forum.mdwn
future_proofing.mdwn
git-annex-shell.mdwn
git-annex.mdwn	sync: Fix git sync with local git remotes even when they don't have an annex.uuid set.	2014-07-15 14:27:43 -04:00
git-union-merge.mdwn
how_it_works.mdwn
index.mdwn
install.mdwn	added gpg instructions	2014-07-24 00:48:33 +00:00
internals.mdwn	implement chunk logs	2014-07-24 16:23:36 -04:00
license.mdwn
location_tracking.mdwn
logo-old-bw.svg
logo-old.png
logo-old.svg
logo-old_small.png
logo.mdwn
logo.svg
logo_16x16.png
logo_32x32.png
logo_small.png
meta.mdwn
metadata.mdwn
news.mdwn
not.mdwn
polls.mdwn
preferred_content.mdwn
privacy.mdwn
publicrepos.mdwn
related_software.mdwn
repomap.png
required_content.mdwn
scalability.mdwn
shortcuts.mdwn
sidebar.mdwn
sitemap.mdwn
special_remotes.mdwn
summary.mdwn
sync.mdwn
testimonials.mdwn
thanks.mdwn	update per request	2014-07-23 10:43:09 -04:00
tips.mdwn
todo.mdwn
transferring_data.mdwn
trust.mdwn
upgrades.mdwn
users.mdwn
videos.mdwn
walkthrough.mdwn