Commit Graph

3050 Commits

Author SHA1 Message Date
Joey Hess b86a482924 remove privdata from master, to avoid conflicts with other users' privdata
This will result in some easily resolved merge conflicts when I merge
joeyconfig into master. I never merge master into joeyconfig so that's ok.
2014-08-19 15:02:28 -04:00
Joey Hess 7d59dee469 local repo fully working now 2014-08-19 15:02:12 -04:00
Joey Hess c8b8582341 Merge branch 'joeyconfig' 2014-08-19 14:35:55 -04:00
Joey Hess b6c5f54741 The Debian package now includes a single-revision git repository in /usr/src/propellor/, and ~/.propellor/ is set up to use this repository as its "upstream" remote. This avoids relying on the security of the github repository when using the Debian package. 2014-08-19 14:35:38 -04:00
Joey Hess fd2bd09135 Merge remote-tracking branch 'origin/master' 2014-08-19 14:34:20 -04:00
Joey Hess ebeb3cb8fa Merge branch 'joeyconfig' 2014-08-19 14:34:16 -04:00
Joey Hess e6f13a9af9 The Debian package now includes a single-revision git repository in /usr/src/propellor/, and ~/.propellor/ is set up to use this repository as its "upstream" remote. This avoids relying on the security of the github repository when using the Debian package. 2014-08-19 14:33:43 -04:00
Joey Hess c3c1f921bb upgrade note 2014-08-19 14:17:04 -04:00
Joey Hess 1ed98cc755 Included the config.hs symlink to config-simple.hs in the cabal and Debian packages. 2014-08-19 14:16:53 -04:00
Joey Hess f162c629e4 update 2014-08-19 12:33:29 -04:00
http://joeyh.name/ bcbf53cad6 Added a comment 2014-08-17 23:43:03 +00:00
Joey Hess f727bceb75
propellor spin 2014-08-13 16:52:32 -04:00
Joey Hess 5011529def
propellor spin 2014-08-13 16:31:35 -04:00
Joey Hess 8bea99ea0e add news item for propellor 0.8.2 2014-08-04 02:13:58 -04:00
Joey Hess e743068ccf Merge remote-tracking branch 'refs/remotes/dgit/dgit/sid' 2014-08-04 01:56:23 -04:00
Joey Hess 9a856f6aa9 Merge branch 'master' of ssh://propellor.branchable.com 2014-08-04 01:12:55 -04:00
Joey Hess 81f370b9da Merge branch 'joeyconfig' 2014-08-04 01:12:39 -04:00
Joey Hess 9d2cc7774b prep release 2014-08-04 01:12:34 -04:00
Joey Hess 261ed396fe
propellor spin 2014-07-23 12:49:38 -04:00
Joey Hess 08a3c52017
propellor spin 2014-07-23 12:48:46 -04:00
Joey Hess 6cf770c699
propellor spin 2014-07-23 12:45:04 -04:00
Joey Hess 02d7e6d5c6 changelog 2014-07-23 12:43:30 -04:00
Joey Hess 8fc3b61431
propellor spin 2014-07-23 12:42:17 -04:00
Joey Hess db7c012c1a
propellor spin 2014-07-23 12:41:53 -04:00
Joey Hess 74e28cb6b4
propellor spin 2014-07-23 12:41:39 -04:00
Joey Hess 359f13323d
propellor spin 2014-07-23 12:39:11 -04:00
Joey Hess ac46ab4d0c
propellor spin 2014-07-23 12:33:44 -04:00
Joey Hess 3d617fd98b
propellor spin 2014-07-23 12:33:11 -04:00
Joey Hess 41a23743e7
propellor spin 2014-07-23 12:27:38 -04:00
Joey Hess de50ea480d
propellor spin 2014-07-23 12:26:24 -04:00
Joey Hess dd32a63a07
propellor spin 2014-07-23 12:25:38 -04:00
Joey Hess ecc275cfeb
propellor spin 2014-07-23 12:23:44 -04:00
Joey Hess d393b8fc53
propellor spin 2014-07-23 11:58:32 -04:00
Joey Hess 7d3c09df5f
propellor spin 2014-07-23 11:52:46 -04:00
Joey Hess b5ebe61483 update 2014-07-23 11:25:54 -04:00
Joey Hess 8d151bf93c
propellor spin 2014-07-23 11:18:48 -04:00
Joey Hess 78bbd860c6
propellor spin 2014-07-23 10:54:21 -04:00
Joey Hess 321a0bdef6
propellor spin 2014-07-23 10:52:26 -04:00
Joey Hess 660f77c28f
propellor spin 2014-07-22 16:40:11 -04:00
Joey Hess ed83966460
propellor spin 2014-07-22 16:29:22 -04:00
Joey Hess dc1a8db064
propellor spin 2014-07-22 16:28:04 -04:00
Joey Hess fcabeb677b
propellor spin 2014-07-22 16:24:25 -04:00
Joey Hess e01fc46ba3
propellor spin 2014-07-22 16:21:54 -04:00
Joey Hess 25cc027025
propellor spin 2014-07-22 16:14:31 -04:00
Joey Hess aa70ac2419 update 2014-07-22 15:48:32 -04:00
Joey Hess 400422a7e6
propellor spin 2014-07-22 15:27:44 -04:00
Joey Hess 98a3114763
propellor spin 2014-07-22 15:25:07 -04:00
Joey Hess 56b1d73e60
propellor spin 2014-07-21 14:40:48 -04:00
Joey Hess 7028c2c9cc
propellor spin 2014-07-18 16:45:40 -04:00
Joey Hess 51edffe173
propellor spin 2014-07-18 16:43:11 -04:00