Kfir Itzhak 3cee6a133d Merge remote-tracking branch 'Sune1337/motion/FrameSkip' ... Conflicts: db/zm_update-1.27.1.sql web/lang/nl_nl.php		2014-04-22 20:13:11 +03:00
..
ajax	clean out autogenerated files	2013-09-12 14:43:57 -04:00
css	clean out autogenerated files	2013-09-12 14:43:57 -04:00
graphics	clean out autogenerated files	2013-09-12 14:43:57 -04:00
includes	more copying mysql2PDO from classic. Also, some fixes in classic	2014-03-21 17:16:56 -04:00
js	Merge remote branch 'nagyrobi/patch-4' into nagyrobi	2014-02-26 09:04:19 -06:00
lang	clean out autogenerated files	2013-09-12 14:43:57 -04:00
views	Merge remote-tracking branch 'Sune1337/motion/FrameSkip'	2014-04-22 20:13:11 +03:00
Makefile.am	Reverting my web changes in develop - keeping them in modern	2013-05-02 10:20:06 -04:00
skin.php	Fix builtin authentication issue caused by commit 6e5d927	2014-02-14 18:56:27 -06:00