| Modified src/RingRun/src/common/rr_runner.lua | |
| diff --git a/src/RingRun/src/common/rr_runner.lua b/src/RingRun/src/common/rr_runner.lua | |
| index e0b32ad..0a48d9f 100644 | |
| --- a/src/RingRun/src/common/rr_runner.lua | |
| +++ b/src/RingRun/src/common/rr_runner.lua | |
| @@ -926,9 +926,13 @@ function Runner:switch_in_started(time, step) | |
| else | |
| klog.debug("Boost conditions weren't met.") | |
| end | |
| + |
| # what my local dns was resolving | |
| piragua ~ $ dig pinboard.in | |
| ; <<>> DiG 9.4.2-P1 <<>> pinboard.in | |
| ;; global options: printcmd | |
| ;; Got answer: | |
| ;; ->>HEADER<<- opcode: QUERY, status: NXDOMAIN, id: 17906 | |
| ;; flags: qr rd ra; QUERY: 1, ANSWER: 0, AUTHORITY: 0, ADDITIONAL: 0 | |
| ;; QUESTION SECTION: |
| (defun to-x-clip (text) | |
| (let* ((process-connection-type) | |
| (xsel (start-process "xsel" (get-buffer-create "*xsel*") "xsel" "-i" "-b"))) | |
| (process-send-string xsel text) | |
| (process-send-eof xsel))) | |
| (to-x-clip "hello there") |
| <?xml version="1.0" encoding="utf-8"?> | |
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" | |
| "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> | |
| <html xmlns="http://www.w3.org/1999/xhtml" | |
| lang="en" xml:lang="en"> | |
| <head> | |
| <title>foo</title> | |
| <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/> | |
| <meta name="generator" content="Org-mode"/> | |
| <meta name="generated" content="2012-07-05 16:13:45 UYT"/> |
| ;;; flymake configuration for lua | |
| ;;; assumes luac is in $PATH | |
| ;;; Install: | |
| ;; copy flymake-lua.el somewhere in your load-path | |
| ;; | |
| ;; in ~/.emacs: | |
| ;; (eval-after-load 'lua-mode '(add-hook 'lua-mode-hook 'flymake-lua-setup)) | |
| ;; (autoload #'flymake-lua-setup "flymake-lua" nil t) |
| $ python ../../klibs/scripts/texture_atlas.py -r 80 -d -c pvr -v levels/textures levels/_tmp/textures levels/_tmp/textures.json | |
| INFO:texture_atlas: | |
| input_dir: levels/textures | |
| output_dir: levels/_tmp/textures | |
| output_file: levels/_tmp/textures.json | |
| DEBUG:texture_atlas: env:{'atlas_size': 1024, 'resize_scale': 80.0, 'margin_size': 2, 'output_dir': 'levels/_tmp/textures', 'input_dir': 'levels/textures', 'compress_format': 'pvr'} | |
| INFO:texture_atlas:---- 1. BATCHES ----------------------------------------------- | |
| INFO:texture_atlas: adding textures: 1382 frames, ([]) | |
| INFO:texture_atlas: adding textures/rings: 113 frames, (['_NO_MARGIN', '_NO_TRIM']) |
| ;;; flymake configuration for lua | |
| ;;; assumes luac is in $PATH | |
| ;;; Install: | |
| ;; copy flymake-lua.el somewhere in your load-path | |
| ;; | |
| ;; in ~/.emacs: | |
| ;; (eval-after-load 'lua-mode '(add-hook 'lua-mode-hook 'flymake-lua-setup)) | |
| ;; (autoload #'flymake-lua-setup "flymake-lua" nil t) |
| (setq flymake-temp-dir (expand-file-name "tmp" "~/")) | |
| (defun flymake-get-temp-dir () | |
| (if (boundp 'flymake-temp-dir) | |
| flymake-temp-dir | |
| temporary-file-directory)) | |
| (defun flymake-lua-init () | |
| (let* ((temp-file (flymake-init-create-temp-buffer-copy |
| git clone git://sox.git.sourceforge.net/gitroot/sox/sox | |
| cd sox | |
| git checkout -b sox-14.4.0 sox-14.4.0 | |
| autoreconf -i | |
| ./configure --without-png -without-mad --without-lame --without-flac --without-twolame --without-id3tag | |
| make |
Use magit-ediff or 'e' on an unmerged item to resolve merge conflicts with ediff. Magit will set up an ediff with three buffers A, B and C. A and B are the original (conflicting) files, and C is the conflicted merge.
Use 'n'/'p' to move to the next/previous conflict, use 'a'/'b' to choose which changes (those in a A or B) should be the ones to keep in the merged file.
You can always just switch to buffer C and edit what the merged version should look like.