- Download the perforce visual tool suite from here: http://www.perforce.com/perforce/downloads/index.html
- Copy only the p4merge.app file into your /Applications/ directory
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<!-- | |
The MIT License (MIT) | |
Copyright (c) 2013 [email protected] | |
Permission is hereby granted, free of charge, to any person obtaining a copy | |
of this software and associated documentation files (the "Software"), to deal | |
in the Software without restriction, including without limitation the rights | |
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |
copies of the Software, and to permit persons to whom the Software is |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#------------------------------------------------------------------------------- | |
# Name: Rank Order Centroid | |
# Purpose: Generate rank order centroid weights | |
# | |
# Author: Greg Jennings | |
# | |
# Created: 5 Sep 2012 | |
# Copyright: (c) Greg 2012 | |
# Licence: MIT | |
#------------------------------------------------------------------------------- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[merge] | |
tool = ediff | |
[mergetool "ediff"] | |
cmd = emacsclient -c -a \"\" --eval \"(ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\")\" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
STATUS_CANCELLED = 'cancelled' | |
STATUS_NEW = 'new' | |
STATUS_PENDING = 'pending' | |
STATUS_PAYMENT_DUE = 'payment-due' | |
STATUS_PAYMENT_PENDING = 'payment-pending' | |
STATUS_PAID = 'paid' | |
NEGOTIABLE_STATUS_CHOICES = ( | |
(STATUS_CANCELLED, 'Cancelled'), # Cancelled, duh | |
(STATUS_NEW, 'New'), # Default state of request |
How to set up multiple accounts with Mutt E-mail Client
Thanks to this article by Christoph Berg
Directories and files
~/
How to install Ubuntu 14.04.1 LTS 64-bit on a MacBook Pro Retina 15" Mid 2014 (11,3)
- Ubuntu 14.04 Desktop 64-bit ISO (default, non-Mac version)
http://www.ubuntu.com/download/desktop - UNetbootin
http://unetbootin.sourceforge.net/ - Broadcom 802.11 Linux STA wireless driver source dependencies
http://packages.ubuntu.com/trusty/all/dkms/download
https://www.avaneya.com/images/gallery/vlr/Sample_01.jpg https://www.avaneya.com/images/gallery/vlr/Sample_02.jpg https://www.avaneya.com/images/gallery/vlr/Sample_03.jpg https://www.avaneya.com/images/gallery/vlr/Sample_04.jpg https://www.avaneya.com/images/gallery/vlr/Sample_05.jpg https://www.avaneya.com/images/gallery/vlr/Sample_06.jpg https://www.avaneya.com/images/gallery/vlr/Sample_07.jpg https://www.avaneya.com/images/gallery/vlr/Sample_08.jpg https://www.avaneya.com/images/gallery/vlr/Sample_09.jpg https://www.avaneya.com/images/gallery/vlr/Sample_10.jpg
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<!DOCTYPE html> | |
<html> | |
<body> | |
<!-- 1. The <iframe> (and video player) will replace this <div> tag. --> | |
<div id="player"></div> | |
<div>Current Time: <span id="time"></span></div> | |
<script> | |
// 2. This code loads the IFrame Player API code asynchronously. | |
var tag = document.createElement('script'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(defun kill-current-line () | |
"An abbreviated method for killing a whole line plus the newline terminal" | |
(kill-region (line-beginning-position) (+ (line-end-position) 1))) | |
(defun copy-current-line () | |
"Similar to the above but copy the text rather than cut it" | |
(copy-region-as-kill (line-beginning-position) (+ (line-end-position) 1))) | |
(defun kill-yank (n) | |
(kill-current-line) ;grab current line of text |
OlderNewer