GitHub PushEvent at 2014-03-04 18:04:55
Repository: Editor-Qt
Actor: MarianoGnu
Payload: {"shas":[["8888b8923811b966ae357bb8b6d16a26a7c96c32","55c61069e1fc4a4fa097a3ca5c606848da2bac07@gmail.com","merge plus changes","Lobomon",false],["a791cbdb2aef1e656bca6c113d47546bb0e216cf","a107acefc3e1bf43fdf9cd5eb711bb5c220dcfa1@gmail.com","Merge pull request #6 from MarianoGnu/master\n\nUse liblcf's pro file to build.","Mariano Javier Suligoy",false],["f3a3b5cf7c763cd391e577d0fd6ac219c0b750ac","a107acefc3e1bf43fdf9cd5eb711bb5c220dcfa1@gmail.com","Merge pull request #7 from MarianoGnu/master\n\nliblcf's Data::Clear() issue is fixed, remove patch.","Mariano Javier Suligoy",false],["66805beae63a1cf5642eb06ba88d57698290192e","55c61069e1fc4a4fa097a3ca5c606848da2bac07@gmail.com","Update to use the new readers liblcf","Lobomon",false],["9bc844192aaf06301b2ba1eb061ef8a99aa74898","55c61069e1fc4a4fa097a3ca5c606848da2bac07@gmail.com","Merge branch 'master' of https://github.com/MarianoGnu/Editor-Qt\n\nConflicts:\n\t.gitignore\n\tEasyRPG-Editor.pro\n\tEasyRPG-Editor.pro.user.7746fbb\n\tlibs/README\n\tsrc/mainwindow.cpp\n\tsrc/mainwindow.h\n\tsrc/tools/QGraphicsMapScene.cpp\n\tsrc/tools/QGraphicsMapScene.h\n\ttemplates/Player64.exe","Lobomon",false],["2e41db9c52c915f4c43967c58daad7023ebd053f","55c61069e1fc4a4fa097a3ca5c606848da2bac07@gmail.com","Errors from the merge","Lobomon",false],["301962d112d9b843aa81005b433dea3794fa362e","a107acefc3e1bf43fdf9cd5eb711bb5c220dcfa1@gmail.com","Merge pull request #8 from MarianoGnu/master\n\nFix closeEvent. Add resources.","Mariano Javier Suligoy",false],["4dda59b9f8a8aa01d9715d0764ba0f73df7df021","a107acefc3e1bf43fdf9cd5eb711bb5c220dcfa1@gmail.com","Merge branch 'master' of https://github.com/Lobomon/Editor-Qt into lobomon","Mariano Javier Suligoy",false],["bf3e40d5255a20bf9abfe776893c1aa42e55a521","a107acefc3e1bf43fdf9cd5eb711bb5c220dcfa1@gmail.com","Update gitignore.","Mariano Javier Suligoy",false],["0a4a7ef19c755f0b750bb76cb8c59fad3352e760","55c61069e1fc4a4fa097a3ca5c606848da2bac07@gmail.com","Merge pull request #1 from MarianoGnu/lobomon\n\nUpdate gitignore","Lobomon",false],["8e9f9654e37b8cf5d43474f905f03d26d4557005","55c61069e1fc4a4fa097a3ca5c606848da2bac07@gmail.com","New map interface Created","Lobomon",false],["c65cbc256b7db22754a63ac69226aba73696695c","55c61069e1fc4a4fa097a3ca5c606848da2bac07@gmail.com","Merge branch 'master' of https://github.com/EasyRPG/Editor-Qt","Lobomon",false],["72a6d20e3ddd2cd222ce6e5a1213c6b4bf2b1c9a","55c61069e1fc4a4fa097a3ca5c606848da2bac07@gmail.com","Merge branch 'master' of https://github.com/Lobomon/Editor-Qt","Lobomon",false],["27831c055c30e1ed51c8d399461100b86fd82d3c","a107acefc3e1bf43fdf9cd5eb711bb5c220dcfa1@gmail.com","Merge pull request #9 from Lobomon/master\n\nUpdated events plus new map","Mariano Javier Suligoy",false],["b2d2945c7526a7a8b1dacfce40d90ef8880d3907","a107acefc3e1bf43fdf9cd5eb711bb5c220dcfa1@gmail.com","Update DialogEvent.","Mariano Javier Suligoy",false],["92a3e6d4d69845a4ba43bca7fd39930384ec087f","a107acefc3e1bf43fdf9cd5eb711bb5c220dcfa1@gmail.com","Merge branch 'master' of https://github.com/MarianoGnu/Editor-Qt into lobomon","Mariano Javier Suligoy",false],["ac8804e7fb99b673421cfcf16b7acdd4a8b45e86","a107acefc3e1bf43fdf9cd5eb711bb5c220dcfa1@gmail.com","Merge branch 'master' of https://github.com/EasyRPG/Editor-Qt into lobomon\n\nSolved Conflicts:\n\tEasyRPG-Editor.pro","Mariano Javier Suligoy",false],["44e50316090c5b15f7e269bebdfcc86dbe8399f6","a107acefc3e1bf43fdf9cd5eb711bb5c220dcfa1@gmail.com","Update dialogmapproperties","Mariano Javier Suligoy",false],["162a15e4b8a7192560935646075be4783e16598c","a107acefc3e1bf43fdf9cd5eb711bb5c220dcfa1@gmail.com","Check if event is modified.","Mariano Javier Suligoy",false]],"size":19,"ref":"refs/heads/master","head":"162a15e4b8a7192560935646075be4783e16598c"}