Changeset cdb4bec in network-game for client/Client/Textbox.h

Timestamp:

Dec 9, 2012, 8:59:18 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

3f5616f

Parents:

da692b9 (diff), e607c0f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:weretaco/network-game

File:

• client/Client/Textbox.h (modified) (2 diffs)

client/Client/Textbox.h

@@ -5 +5 @@
 
 #include <string>
+#include <map>
 
 using namespace std;
@@ -14 +15 @@
    string str;
    bool selected;
+   bool shiftPressed;
+   map<char, char> shiftMap;
 
 public: