Permalink
Browse files

Merge branch 'logger'

Conflicts:
	windowsbuild/Armory_Setup_64bit.warsetup
  • Loading branch information...
2 parents 91e8f2e + 6e39300 commit 149ca4aaff7b7bb87b25334577c2848725c7ca39 @etotheipi committed Aug 9, 2012
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
233 LICENSE 100755 → 100644

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -99,6 +99,8 @@ class ArbitraryStruct: pass
Colors.SlightRed = tweakColor(Colors.Background, '*', [1.05, 0.95, 0.95])
Colors.SlightGreen = tweakColor(Colors.Background, '*', [0.92, 1.08, 0.92])
Colors.SlightBlue = tweakColor(Colors.Background, '*', [0.95, 0.95, 1.05])
+Colors.SlightBkgdDark = tweakColor(Colors.Background, '*', [0.95, 0.95, 0.95])
+Colors.SlightBkgdLight = tweakColor(Colors.Background, '*', [1.05, 1.05, 1.05])
Colors.TextNoConfirm = tweakColor(Colors.Mid, '*', [ 0.9, 0.9, 0.9])
Colors.TextSomeConfirm = tweakColor(Colors.Mid, '*', [ 0.7, 0.7, 0.7])
Oops, something went wrong.

0 comments on commit 149ca4a

Please sign in to comment.