aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo Hörnquist <hugo@lysator.liu.se>2022-10-26 16:13:31 +0200
committerHugo Hörnquist <hugo@lysator.liu.se>2022-10-26 16:13:31 +0200
commit9ca31a9bb7d3fcb92798eda83b030f5328c0d12a (patch)
treef36c9a4054c567b11f0b06dba9864ddf92ed85fc
parentMerge branch 'master' of git.hornquist.se:git/wiki-public (diff)
downloadwiki-public-9ca31a9bb7d3fcb92798eda83b030f5328c0d12a.tar.gz
wiki-public-9ca31a9bb7d3fcb92798eda83b030f5328c0d12a.tar.xz
ons 26 okt 2022 16:13:31 CEST
-rw-r--r--.vimwiki_tags2
-rw-r--r--Media.wiki4
-rw-r--r--Vimwiki.wiki27
-rw-r--r--ffmpeg.wiki3
4 files changed, 21 insertions, 15 deletions
diff --git a/.vimwiki_tags b/.vimwiki_tags
index dde8012..5c19d7e 100644
--- a/.vimwiki_tags
+++ b/.vimwiki_tags
@@ -7,3 +7,5 @@
!_TAG_PROGRAM_VERSION 2.5
TODO GitServer.wiki 53;" vimwiki:GitServer\tGitServer#Git Server#Autentisering#Autentisering SSH#Problem
TODO GitServer.wiki 96;" vimwiki:GitServer\tGitServer#Taggning#Cleanup
+tidle Media.wiki 33;" vimwiki:Media\tMedia#tidle
+tilde Media.wiki 34;" vimwiki:Media\tMedia#tilde
diff --git a/Media.wiki b/Media.wiki
index 76b9628..71c1f9d 100644
--- a/Media.wiki
+++ b/Media.wiki
@@ -45,6 +45,10 @@ Teolog
- [X] Getting things done
- [ ] The Common Lisp Condition System
- [ ] Make the Bread, Buy the Butter
+- [ ] Brick by Brick: How LEGO Rewrote the Rules of Innovation and
+ Conqured the Global Toy Industry, by David C. Robertson, Bill
+ Breen
+- [ ] [[https://www.stroustrup.com/dne.html|The Design and Evolution of C++, Bajarne Stroustrup]]
- Lőkar?
- https://www.thedarkweblinks.com/deep-web-books-sites-links/
diff --git a/Vimwiki.wiki b/Vimwiki.wiki
index 54c0d56..e3bd697 100644
--- a/Vimwiki.wiki
+++ b/Vimwiki.wiki
@@ -1,18 +1,19 @@
+%title Vimwiki
= Contents =
- [[#Vimwiki|Vimwiki]]
- - [[#Vimwiki#Användning|Användning]]
- - [[#Vimwiki#Användning#Script|Script]]
- - [[#Vimwiki#Användning#Keybinds|Keybinds]]
- - [[#Vimwiki#Användning#Dairy|Dairy]]
- - [[#Vimwiki#Användning#Checkboxes|Checkboxes]]
- - [[#Vimwiki#Användning#Links|Links]]
- - [[#Vimwiki#Användning#External files|External files]]
- - [[#Vimwiki#Todo|Todo]]
- - [[#Vimwiki#Table of Contents|Table of Contents]]
- - [[#Vimwiki#Table of Contents#Auto TOC|Auto TOC]]
- - [[#Vimwiki#HTML|HTML]]
- - [[#Vimwiki#HTML#HTML sidebar|HTML sidebar]]
- - [[#Vimwiki#HTML#Rubrikslänkar|Rubrikslänkar]]
+ - [[#Vimwiki#Användning|Användning]]
+ - [[#Vimwiki#Användning#Script|Script]]
+ - [[#Vimwiki#Användning#Keybinds|Keybinds]]
+ - [[#Vimwiki#Användning#Dairy|Dairy]]
+ - [[#Vimwiki#Användning#Checkboxes|Checkboxes]]
+ - [[#Vimwiki#Användning#Links|Links]]
+ - [[#Vimwiki#Användning#External files|External files]]
+ - [[#Vimwiki#Todo|Todo]]
+ - [[#Vimwiki#Table of Contents|Table of Contents]]
+ - [[#Vimwiki#Table of Contents#Auto TOC|Auto TOC]]
+ - [[#Vimwiki#HTML|HTML]]
+ - [[#Vimwiki#HTML#HTML sidebar|HTML sidebar]]
+ - [[#Vimwiki#HTML#Rubrikslänkar|Rubrikslänkar]]
= Vimwiki =
Den här repon versionskontrolleras på git@hornquist.se/git/vimwiki.git,
diff --git a/ffmpeg.wiki b/ffmpeg.wiki
index 42c026e..9fdfef5 100644
--- a/ffmpeg.wiki
+++ b/ffmpeg.wiki
@@ -16,5 +16,4 @@ ffmpeg -i 'Angry Video Game Nerd - The Movie.mkv' \
avgn-final.mp4
}}}
-
-
+- [ ] ffmpeg -i *.mp4 -i *.srt -c copy out.mkv