Commits

Branch selector

 master

User selector

All users

All time

Commit history

Commits on Jan 10, 2015

• Merge remote-tracking branch 'upstream/master'

  

  Brian T. Crowder

  committed
  2698b14

  Copy full SHA for 2698b14

• Mac OS X build fixes

  

  Brian T. Crowder

  committed
  8867cfd

  Copy full SHA for 8867cfd

Commits on Jan 6, 2015

• Fix buildingplan stuff on Windows.

  expwnent

  committed
  448404a

  Copy full SHA for 448404a

• Disable fortplan and buildingplan for now because it doesn't compile on Windows.

  expwnent

  committed
  1519d8e

  Copy full SHA for 1519d8e

• Update xml.

  expwnent

  committed
  7e11ad8

  Copy full SHA for 7e11ad8

Commits on Jan 5, 2015

• Make fortplan use Filesystem::getcwd()

  lethosor

  committed
  cd64fb8

  Copy full SHA for cd64fb8

• Fix MapCache compiling error on Windows

  lethosor

  committed
  d932c76

  Copy full SHA for d932c76

• Update version in NEWS

  lethosor

  committed
  f4b7578

  Copy full SHA for f4b7578

• Update contributors list

  lethosor

  committed
  318fb52

  Copy full SHA for 318fb52

• Update xml

  lethosor

  committed
  5de5d44

  Copy full SHA for 5de5d44

• Run fixTexts.sh

  lethosor

  committed
  a28fde3

  Copy full SHA for a28fde3

• Merge remote-tracking branches 'cdombroski/autobutcher' and 'cdombroski/siren.lua'

  Show description for f451cfb
  lethosor

  committed
  f451cfb

  Copy full SHA for f451cfb

• Merge remote-tracking branch 'lethosor/tweaks-2'

  Show description for 67f0aa7
  lethosor

  committed
  67f0aa7

  Copy full SHA for 67f0aa7

• Merge remote-tracking branch 'lethosor/embark-tools-mouse'

  Show description for e9fd8cf
  lethosor

  committed
  e9fd8cf

  Copy full SHA for e9fd8cf

• Merge remote-tracking branch 'lethosor/plugload-posix'

  lethosor

  committed
  182f317

  Copy full SHA for 182f317

• Merge remote-tracking branch 'eswald/alt-stuck'

  Show description for 0cfe6a1
  lethosor

  committed
  0cfe6a1

  Copy full SHA for 0cfe6a1

• Merge remote-tracking branch 'lethosor/patch-10'

  lethosor

  committed
  8311534

  Copy full SHA for 8311534

• Merge remote-tracking branch 'danaris/fortplan'

  Show description for 0c76879
  lethosor

  committed
  0c76879

  Copy full SHA for 0c76879

• Merge remote-tracking branches 'lethosor/export-dt-ini-0.40.21' and 'lethosor/patch-9'

  lethosor

  committed
  06029c9

  Copy full SHA for 06029c9

• Merge remote-tracking branch 'lethosor/osx-libstdc++'

  Show description for 57f6a94
  lethosor

  committed
  57f6a94

  Copy full SHA for 57f6a94

• Merge remote-tracking branch 'lethosor/0.40.22-plugins'

  Show description for 7da9ab8
  lethosor

  committed
  7da9ab8

  Copy full SHA for 7da9ab8

• Merge remote-tracking branch 'PeridexisErrant/keybinding-defaults'

  Show description for 83142b9
  lethosor

  committed
  83142b9

  Copy full SHA for 83142b9

• Merge remote-tracking branch 'PeridexisErrant/digfort-checks'

  Show description for 3bc17da
  lethosor

  committed
  3bc17da

  Copy full SHA for 3bc17da

• Merge remote-tracking branches 'lethosor/remove-embark' and 'lethosor/revert-401-dfhack-log'

  Show description for 8f60e0e
  lethosor

  committed
  8f60e0e

  Copy full SHA for 8f60e0e

• Update NEWS

  lethosor

  committed
  2bc5fe2

  Copy full SHA for 2bc5fe2

• Merge remote-tracking branch 'eswald/trackstop'

  Show description for 1d0b4de
  lethosor

  committed
  1d0b4de

  Copy full SHA for 1d0b4de

• Merge remote-tracking branch 'PeridexisErrant/needs_porting-cleanup'

  Show description for ad6b19f
  lethosor

  committed
  ad6b19f

  Copy full SHA for ad6b19f

• Merge remote-tracking branches 'warmist/advfort', 'Putnam3145/patch-8', 'AndreasPK/master' and 'PeridexisErrant/fix-exportlegends'

  lethosor

  committed
  f0e7d2b

  Copy full SHA for f0e7d2b

• Merge remote-tracking branch 'ramblurr/stockpiles'

  Show description for 6e36b22
  lethosor

  committed
  6e36b22

  Copy full SHA for 6e36b22

• Merge remote-tracking branch 'lethosor/plugin-globals'

  lethosor

  committed
  ca0860c

  Copy full SHA for ca0860c

• Merge remote-tracking branch 'quipyowert/define-maxlayers' into 0.40.23-r1

  lethosor

  committed
  983f096

  Copy full SHA for 983f096

• Bash script to build dfhack according to the instructions in Compile.rst.

  Show description for fba77a6
  

  Matthew Townsend

  authored and

  lethosor

  committed
  fba77a6

  Copy full SHA for fba77a6

• Disable excessive logging in Process-darwin.cpp

  lethosor

  committed
  9f2bdc2

  Copy full SHA for 9f2bdc2

• Fix error in WatchedRace::SortUnitsByAge

  cdombroski

  committed
  929f63e

  Copy full SHA for 929f63e

• Clean up whitespace in Hooks-darwin.cpp

  lethosor

  committed
  e7ee29b

  Copy full SHA for e7ee29b