Commit Graph

17 Commits

Author SHA1 Message Date
Brian Buller f729d74818 Move vimwiki back to Dropbox 2015-03-31 07:50:17 -05:00
Brian Buller 5c305ca866 Merge branch 'master' of gogs:brian/vim-castle
Conflicts:
	.vim/vimwiki/vimwiki/Linux_Slackware.wiki
	.vim/vimwiki/vimwiki/Notes.wiki
	.vim/vimwiki/vimwiki/Other.wiki
	.vim/vimwiki/vimwiki/Play.wiki
	.vim/vimwiki/vimwiki/RR3_ModList.wiki
	.vim/vimwiki/vimwiki/Slackware_FullSystemUpgrade.wiki
	.vim/vimwiki/vimwiki/Slackware_Parallels.wiki
	.vim/vimwiki/vimwiki/Slackware_PostInstallation.wiki
	.vim/vimwiki/vimwiki/Starbound.wiki
	.vim/vimwiki/vimwiki/Work.wiki
	.vim/vimwiki/vimwiki/bible_topics_identity.wiki
	.vim/vimwiki/vimwiki/work_clients_high_touch_enertech_capture.wiki
	.vim/vimwiki/vimwiki_html/Linux_Slackware.html
	.vim/vimwiki/vimwiki_html/Notes.html
	.vim/vimwiki/vimwiki_html/Other.html
	.vim/vimwiki/vimwiki_html/Play.html
	.vim/vimwiki/vimwiki_html/RR3_ModList.html
	.vim/vimwiki/vimwiki_html/Slackware_FullSystemUpgrade.html
	.vim/vimwiki/vimwiki_html/Slackware_Parallels.html
	.vim/vimwiki/vimwiki_html/Slackware_PostInstallation.html
	.vim/vimwiki/vimwiki_html/Starbound.html
	.vim/vimwiki/vimwiki_html/Work.html
	.vim/vimwiki/vimwiki_html/bible_topics_identity.html
	.vim/vimwiki/vimwiki_html/work_clients_high_touch_enertech_capture.html
2015-03-31 07:48:27 -05:00
Brian Buller f6badb1501 Moved Vimwiki back to dropbox 2015-03-31 07:44:40 -05:00
Brian Buller 7aab30063c Merge branch 'master' of gogs.bullercodeworks.com:brian/vim-castle 2015-03-19 07:13:46 -05:00
Brian Buller 62cd9e29c7 Adding some more stuff 2015-03-19 07:12:04 -05:00
Brian Buller 744a86cb52 Updating everything 2015-03-19 07:11:51 -05:00
Brian Buller c344ed3377 Remove netrwhist 2015-02-22 19:56:47 -06:00
Brian Buller 85ff90df94 Add Scratch
Also, vimwiki updates
2015-02-04 18:03:08 -06:00
Brian Buller 47b459258a VimWiki Changes 2015-02-03 14:03:03 -06:00
Brian Buller 787fad28c2 vimwiki 2015-02-02 17:02:47 -06:00
Brian Buller e94c1fc208 VimWiki Updates 2015-02-02 09:09:27 -06:00
Brian Buller 696463e9ba vimwiki Updates 2015-02-02 08:52:59 -06:00
Brian Buller 2e1c2791e0 New VimWiki Stuff 2015-01-22 09:08:14 -06:00
Brian Buller 1fbdc3052e Updates 2015-01-22 09:07:51 -06:00
Brian Buller 617b517a3b Vimwiki 2015-01-14 21:42:45 -06:00
Brian Buller 9a91866f7b Readded Submodules 2015-01-14 21:01:52 -06:00
Brian Buller 64ed7fa7cd Resetting... 2015-01-14 20:59:39 -06:00