Merge branch 'master' of sleepmap:dotfiles

* 'master' of sleepmap:dotfiles: (51 commits)
  .autorandr/*: Clean slate for all autorandr profiles.
  .password-store: Updating password store to latest commits.
  .gitignore: Removing some unneeded stuff that has been added to the repo.
  fonts.conf: Updating to a correct path structure.
  .fonts: Removing top level configuration.
  .fonts.conf: Adding a custom fontconfig cache dir, so .cache can be a tmpfs and won't need a symlink to the fontconfig directory.
  .fonts.conf: Adding a custom fontconfig cache dir, so .cache can be a tmpfs and won't need a symlink to the fontconfig directory.
  termite/config: Explicitly adding firefox as browser, so clickable URLs will work
  .Xresources: Removing double entry for background
  .rtorrent.rc: Adding rtorrent configuration file
  profile-cleaner.conf: Adding standard setting for profile cleaner (dark background)
  .config/mpd/folders: Adding default folders for mpd.
  shotwell: Adding symlink for configuration.
  .config/systemd: Adding current systemd --user setup.
  pavucontrol.ini: Adding standard window size
  ardour3: Adding configs for Ardour3.
  .tmux.conf: base-index is added properly with -g now.
  base.cfg: Terminology base settings update
  conky: Add top, right, bottom conky config.
  rollback-profile: Changing the backup location.
  ...

1 files changed, 8 insertions, 10 deletions

diff --git a/.arduino/preferences.txt b/.arduino/preferences.txt
index 1401472..6724ae7 100644
--- a/.arduino/preferences.txt
+++ b/.arduino/preferences.txt
@@ -1,6 +1,6 @@
 board=uno
 browser=mozilla
-browser.linux=mozilla
+build.warn_data_percentage=75
 console=true
 console.auto_clear=true
 console.error.file=stderr.txt
@@ -10,19 +10,16 @@ console.output.file=stdout.txt
 editor.antialias=false
 editor.caret.blink=true
 editor.divider.size=0
-editor.divider.size.windows=2
 editor.external=false
 editor.font=Monospaced,plain,12
-editor.font.macosx=Monaco,plain,10
 editor.indent=true
 editor.invalid=false
 editor.keys.alternative_cut_copy_paste=true
-editor.keys.alternative_cut_copy_paste.macosx=false
 editor.keys.home_and_end_travel_far=false
-editor.keys.home_and_end_travel_far.macosx=true
 editor.keys.shift_backspace_is_delete=true
 editor.languages.current=
 editor.linenumbers=false
+editor.save_on_verify=true
 editor.tabs.expand=true
 editor.tabs.size=2
 editor.window.height.default=600
@@ -32,13 +29,12 @@ editor.window.width.min=400
 export.applet.separate_jar_files=false
 export.application.fullscreen=false
 export.application.platform=true
-export.application.platform.linux=true
-export.application.platform.macosx=true
-export.application.platform.windows=true
 export.application.stop=true
 export.delete_target_folder=true
 last.ide.1.0.6.daterun=1411912958
 last.ide.1.0.6.hardwarepath=/usr/share/arduino/hardware
+last.ide.1.6.0.daterun=1424022507
+last.ide.1.6.0.hardwarepath=/usr/share/arduino/hardware
 last.screen.height=1200
 last.screen.width=1920
 last.sketch.count=0
@@ -61,7 +57,6 @@ run.options.memory.initial=64
 run.options.memory.maximum=256
 run.present.bgcolor=#666666
 run.present.exclusive=false
-run.present.exclusive.macosx=true
 run.present.stop.color=#cccccc
 run.window.bgcolor=#DFDFDF
 serial.databits=8
@@ -70,9 +65,12 @@ serial.parity=N
 serial.port=COM1
 serial.stopbits=1
 sketchbook.path=/home/dave/git/sketchbooks/arduino-sketchbook
+software=ARDUINO
 target=arduino
+target_package=arduino
+target_platform=avr
 update.check=true
 update.id=-5111801774645063504
-update.last=1411912792122
+update.last=1424022508963
 upload.using=bootloader
 upload.verify=true