Changeset a9e808e in network-game for client


Ignore:
Timestamp:
May 17, 2014, 6:55:01 PM (11 years ago)
Author:
Dmitry Portnoy <dmp1488@…>
Branches:
master
Children:
883bb5d
Parents:
95d7add (diff), af116c0 (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

Location:
client
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • client/Client/main.cpp

    r95d7add ra9e808e  
    263263   {
    264264      ALLEGRO_EVENT ev;
    265      
     265
    266266      al_wait_for_event(event_queue, &ev);
    267267
    268268      if(wndCurrent->handleEvent(ev)) {
     269         cout << "Processed gui event: " << getCurrentMillis() << endl;
    269270         // do nothing
    270271      }

  • client/makefile

    r95d7add ra9e808e  
    3636
    3737clean:
    38         rm *.o
    39         rm gameClient
     38        rm -f *.o
     39        rm -f gameClient
Note: See TracChangeset for help on using the changeset viewer.