From: Samual Lenks <samual@xonotic.org>
Date: Sun, 29 Dec 2013 10:29:16 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/terencehill/color_picker_carets'
X-Git-Tag: xonotic-v0.8.0~251
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bf20397b0c62c9de0335ef9d70d60842fde9d0b2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/terencehill/color_picker_carets'

# By terencehill
# Via terencehill
* origin/terencehill/color_picker_carets:
  Optimize a check
  If there's a caret before the cursor in the input box when clicking on the color picker, escape the caret so we can add a valid color code
  Improve detection of color codes when dragging the mouse in the color picker: color code isn't valid if caret is escaped (e.g. ^^x123)
---

bf20397b0c62c9de0335ef9d70d60842fde9d0b2