From: notaz <notasas@gmail.com>
Date: Mon, 1 Apr 2013 22:34:21 +0000 (+0300)
Subject: Merge branch 'master' into libretro
X-Git-Tag: r24l~953
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a95a5e2e0c4bd0da035729d2fd16c068cbd0f633;hp=0069615fdda3a28da547a191bef990256620ff69;p=pcsx_rearmed.git

Merge branch 'master' into libretro
---

diff --git a/frontend/libretro.c b/frontend/libretro.c
index e22ef5b3..f916f57a 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -250,7 +250,7 @@ void retro_get_system_info(struct retro_system_info *info)
 {
 	memset(info, 0, sizeof(*info));
 	info->library_name = "PCSX-ReARMed";
-	info->library_version = REV;
+	info->library_version = "r19";
 	info->valid_extensions = "bin|cue|img|mdf|pbp|cbn";
 	info->need_fullpath = true;
 }