labofsahil/github-event-dataset-2012 huggingface dataset:
Lating camera
Merge branch 'master' of git@github.com:tooflya/bounce-kid.git

Conflicts:
	src/com/tooflya/bouncekid/entity/Personage.java
Merge branch 'master' of git@github.com:tooflya/bounce-kid.git
Day and night timers set at 2 and 5 minutes respectively. This is generous compared to the old perl Mafia!!
Closes #6
make fugitive commands available in nerdtree bufs

Previously s:Detect() wasnt getting called for nerdtree buffers. I have
added two autocmd events to nerdtree - NERDTreeInit and
NERDTreeNewRoot. These are called when a tree is created, and when the
user changes the root.

Catch these events and call s:Detect() with the tree root path.
added ability to set repeat when loading move dom
creates and saves purchase objects, credit card process test
Tracking the .gitignore file for this project now
a game has four players
players are newed up with score of 0
Working XMLTokenReader implementation.

Restored aliases for ValCodec classes in ClassAliases, they are used by
XML and JSON token reader/writer for convenience in getting appropriate
names, etc.
Added close implementation to TokenReader and TokenWriter, to clear
caches on close (might as well clear them early to avoid retaining the
data any longer than necessary)
Fixed some tabs.
Add hierarchy persistence when returning new collections via collection.find(). fill() changed to import(). Both Model and Collection have been given an export() method. Model now has a clone() method.
Ignore maven target directory
Merge branch 'master' of git://github.com/treymarc/mwi-swing
Merge branch 'master' of git://github.com/treymarc/mwi-swing
Merge branch 'master' of git://github.com/treymarc/mwi-swing
Replaced parameterized JComboBoxes with MwJComboBox
Merge branch 'master' of git://github.com/treymarc/mwi-swing
Merge branch 'master' of git://github.com/treymarc/mwi-swing

Conflicts:
	build/lib/mwgui-0.0.1a-SNAPSHOT-jar-with-dependencies.jar
Merge branch 'master' of git://github.com/treymarc/mwi-swing
Removed Java 7 specific code
Merge branch 'master' of git://github.com/treymarc/mwi-swing

Conflicts:
	build/lib/mwgui-0.0.1a-SNAPSHOT-jar-with-dependencies.jar
	src/main/java/eu/kprod/MwGuiFrame.java
	src/main/java/eu/kprod/gui/comboBox/MwJComboBox.java
Removed parameterization of MwJComboBox
Merge branch 'master' of git://github.com/treymarc/mwi-swing

Conflicts:
	build/lib/mwgui-0.0.1a-SNAPSHOT-jar-with-dependencies.jar
without .gitignore
how is there no more convenient way to get the load average than this?
This flexbox thing is..kind of weird
Tweak calculated ABV method.
3 cas de lois de compositions internes
Resolve, "Issue 2856: limit(x**16/(x**16 + 1), x, oo) fails"

The limit, limit(x**16/(1+x**16), x, oo) fails, not only for 16, but for an exponent of 'x' in expression, greater than 16.
This patch gives the accurate results.
Necessary test cases are also attached.
Merge branch 'finallimit' of https://github.com/tsndiffopera/sympy into finallimit
aura: Add bin/aura and .aura.
Updated syntastic to master
Updated django html syntax
Added popover for users that aren't logged in
made login/signup into buttons
Styled up post a little
Styled up and fixed editing a post
Spoke list should really be bulleted
fix rake build
git mergetool stuff
Update notes for submitted changes

* [BUGFIX] Adapt EXT: beuser filter style to page module
Update notes for submitted changes

* [TASK] Fix CGL violations against OpeningFunctionBraceKernighanRitchie
Update notes for submitted changes

* [TASK] Fix CGL violations against ClassDocComment
[BUGFIX] Regression of "better condition in versionOL of t3lib_tstemplate"

versionOL in t3lib_tstemplate can cause a fatal error for
scripts like eID that run in frontend mode, but without a full
blown frontend environment.

The patch replaces the frontend check with a more specific test
for the required methods.

Change-Id: Ib3f9ebf355ee820e5144dd484d9a3a5e7708ebd4
Related: #31139, #25144
Resolves: #36981
Releases: 6.0, 4.7, 4.6, 4.5
Reviewed-on: http://review.typo3.org/11096
Reviewed-by: Susanne Moog
Tested-by: Susanne Moog
[BUGFIX] Properly quote regexp in Install Tool

Characters with a special meaning must be properly quoted
if they appear in a regular expression.

Change-Id: I2587acb9d0f61a441be6e13dcaba7b7ca0fc82bc
Releases: 6.0, 4.7, 4.6, 4.5
Fixes: #35410
Reviewed-on: http://review.typo3.org/10103
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
Reviewed-by: Philipp Gampe
Reviewed-by: Susanne Moog
Tested-by: Susanne Moog
Update notes for submitted changes

* [BUGFIX] t3lib_db - expects parameter 1 to be resource, boolean given
[BUGFIX] Add missing link to travis script

Change-Id: If48fac0913b9647f5ce1df73e7892e3838e51c36
Releases: 4.7
Resolves: #38567
Reviewed-on: http://review.typo3.org/12527
Reviewed-by: Helmut Hummel
Tested-by: Helmut Hummel
[TASK] Fix CGL violations against OpeningFunctionBraceKernighanRitchie

Change-Id: I4267353d2e1d0036278fc33d76f7bfd00868ff1d
Resolves: #41191
Releases: 6.0
Reviewed-on: http://review.typo3.org/14852
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer
Reviewed-by: Andy Grunwald
Tested-by: Andy Grunwald
Reviewed-by: Helmut Hummel
Tested-by: Helmut Hummel
[TASK] Fix CGL violations against ClassDocComment

Change-Id: I12aed20e3ee95022e80e9ee4abcf493e24f8de2b
Resolves: #41187
Releases: 6.0
Reviewed-on: http://review.typo3.org/14846
Reviewed-by: Anja Leichsenring
Tested-by: Anja Leichsenring
Reviewed-by: Andy Grunwald
Tested-by: Andy Grunwald
Reviewed-by: Nicole Cordes
Tested-by: Nicole Cordes
Reviewed-by: Philipp Gampe
Tested-by: Philipp Gampe
Reviewed-by: Helmut Hummel
Tested-by: Helmut Hummel
Update notes for submitted changes

* [TASK] Namespace and move t3lib unit tests - 1
Revert "[BUGFIX] In IE9, RTE does not work correctly in compat modes IE8/IE7"

This reverts commit 92d9f35bc5b58add2148bcb3debc6b68f14dd376

Avoid reliance on order of stylesheets.

Change-Id: I2df4da14249e1a79cba8b772f3091401180706a1
Reviewed-on: http://review.typo3.org/12557
Reviewed-by: Stanislas Rolland
Tested-by: Stanislas Rolland
[BUGFIX] Make FAL Folder not found handling more user friendly

If an user moves the folder he currently views in the file
list module, after reload he sees only a red FlashMessage
error because the viewed folder is gone.

As the JavaScript cannot determine what might be the
identifier of the moved folder (after moving) it cannot
redirect there. Thus the file module needs to react more
user friendly in such a situation.

As a solution the module tries parent folders in, too.

Change-Id: Id9e8d988b159c3f0a21b41c4d1782101146ad23c
Fixes: #40547
Releases: 6.0
Reviewed-on: http://review.typo3.org/14301
Tested-by: Marcel Burkhalter
Reviewed-by: Anja Leichsenring
Tested-by: Anja Leichsenring
Reviewed-by: Benjamin Mack
Tested-by: Benjamin Mack
[RELEASE] Release of TYPO3 4.6.10

Change-Id: If34f7014918dbc9b69009e1396feb268b449f264
Reviewed-on: http://review.typo3.org/12597
Reviewed-by: TYPO3 Release Team
Tested-by: TYPO3 Release Team
[TASK] Set TYPO3 version to 4.6.11-dev

Change-Id: I3ab632491171971ab7b46b694b6ad47ee1a492b5
Reviewed-on: http://review.typo3.org/12598
Reviewed-by: TYPO3 Release Team
Tested-by: TYPO3 Release Team
Update notes for submitted changes

* [BUGFIX] Default behaviour for field rendering of configuration is dropped
[BUGFIX] Wrong DB fields usage in TCEmain

The fix for issue #35260 introduced a new bug in method
t3lib_TCEmain::getPreviousLocalizedRecordUid() by adding a
field in a query in the wrong place. In particular, this breaks
the localization of tt_content elements used with IRRE.

This patch fixes the problem by separating the list of fields
used for selecting and for sorting.

Change-Id: If471cc8a00ef849e94a16f05f144b2985c530831
Fixes: #37221
Releases: 6.0, 4.7, 4.6, 4.5
Reviewed-on: http://review.typo3.org/11294
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
Add sub modules
	- html-minifier
	- yuicompressor
setting a default working folder
add working folder possibiity for default stuff to the game
adding working folder substitution
text aligned right
setting database directory
[2648] Cleanup and improve script for Midnight - Karazhan

This will remove hacks and allow the creatures to use spells
Also fix a typo in Maexxna script

Signed-off-by: Xfurry <xfurry@scriptdev2.com>

Conflicts:

	scripts/eastern_kingdoms/karazhan/boss_midnight.cpp
	sd2_revision_nr.h
[2649] Drop some gameobjects scripts - will be handled by DB

Signed-off-by: Xfurry <xfurry@scriptdev2.com>

Conflicts:

	scripts/world/go_scripts.cpp
[2650] Fix a possible bug for quest 8483
[2651] Implement script support for quest 4121

Signed-off-by: Xfurry <xfurry@scriptdev2.com>
Merge branch 'master' of https://github.com/mangosR2/scriptdev2
ICC: Fix Blood prince council
Merge branch 'master' of https://github.com/Radicalmangos/scriptdev2
building the package with sfact
Add some conveniences to vimrc for dealing w/trailing whitespace
Flexible browsing
Build script for TeamCity deploy
are more files
first attempt at stubbing out the compiler
Add 500px script to show picture at bottom of page.
Add script so you can drag images off of site to save them locally with ease.
Display full commit message
Add ignore_paths setting for rake task.
Merge pull request #106 from wfarr/master

Add support for ignoring certain globs in the rake task
Merge pull request #110 from vStone/master

This fixes the build on Travis CI for ruby1.9
fixes spelling and typo errors in README
Update gitignore
POC lexer
Use the new built in lexer
Allow the lexer to pick up variables with dashes
Remove all the Puppet version specific limitations
Rewrite variable_contains_dash check to use new lexer
Clean up CheckVariables tests
Calculate the correct offset for variables in strings
Derp
Fix lexer bug when first char is a newline
Process keywords early

Keywords were being caught by the :NAME token regex
Line number should be 1 when first char is \n
Split {class,defined_type}_indexes out of filter_tokens

Because I really hate that method
Update right_to_left_relationship check
Update autoloader_layout check
Update parameter_order check
add daily template
title change
update
maps added
trying to get this to work
User and error package addition
Providing a way to share this configuration easier with a file dedicated to identity.
The file (~/.emacs.d/sarcasm-elisp/sarcasm-id.el) should contain at least:

(setq user-mail-address "mail@example.com"
      user-full-name "Name Lastname")
(provide 'sarcasm-id)

	modified:   .gitignore
	modified:   sarcasm-elisp/sarcasm.el
security tests for wallpapers
fixes, User profile and tests
show form errors, testing
some fixes from 26/07, tests may not work
marked some tests as incomplete while solving problems
Merge pull request #51 from verdet23/master

Simple admin wallpaper
fix spaces
Merge branch 'file' of https://github.com/verdet23/wallpaper into verdet

* 'file' of https://github.com/verdet23/wallpaper:
  fix spaces
  show form errors, testing
added @Secure support
Merge remote-tracking branch 'upstream/master'

Conflicts:
	composer.lock
refactored WallpaperControllerTest
refactored fixtures files
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/Application/Bundle/DefaultBundle/Controller/WallpaperController.php
	src/Application/Bundle/DefaultBundle/DataFixtures/MongoDB/LoadCategoriesData.php
	src/Application/Bundle/DefaultBundle/Tests/Controller/WallpaperControllerTest.php
	src/Application/Bundle/UserBundle/DataFixtures/MongoDB/LoadUserData.php
Added some tests for Wallpaper controller, fixed @todo blocks
changed usernameCannonial on plain username, Default UserBundle test enabled
CodeSniffer changes applied
new fixes
Rolebacl CSS/Admin classes, fixed @param's
new fixes
image
uppgift 6 klar
Added syntactic coloration to README

This is just to claim I've contributed to a clojure project. I'm sorry.
Merge pull request #1 from n1k0/patch-1

Added syntactic coloration to README
simple change.
updated api key to remove test key
permission for "Управляющего"
new mb formula entered
Template with a viewport meta tag for callback
Migration script for database change required for multi stage mentor application. Run the script to update table user_mentorapplication and create required indexes
be more granular with reprojection (mean vs. sum etc)
triangleError

/
Tab spaces in views
Mend bad merge [DC]
deps
Merge commit 'c8de2d4'
Remove Test::MoreMore::Mock dependency
Pending rules based ai
add scrollToTop helper function and use deferred window.scroll for ios
changes from feedback
use 0 for y offset as android value of 1 will happen because of minimumYOffset
. add box support and pagination support
add js file where encrypt happen
now committing to github
Merge branch 'master' of https://github.com/wanisadel/testRepo
fix first addon-sdk test
ツイートのproxy対応
Merge remote branch 'heroku/master' into heroku
OAuth Proxyオプション対応
Auth button added to header
Merge remote-tracking branch 'origin/master'
add UserController::showLoginAction and template
Router e Helper.

No router foo aficionado a conditional tag is_posts_page como singular e no is_home, case o utilizador pretend alterar no admin a pagina home. No helpers foo aficionado funçoes para construção da breadcrumb.
happy pigs intro final
Update broken label for Win7 64 which referenced 32
Minor improvement to the 'T' date format unit test.

Still doesn't work if your timezone is listed under another name, e.g. 'CST'. At least it's using the right timezone offset now.
Wed Jun 20 01:34:38 BST 2012
Tue May 22 15:53:06 BST 2012
Tue May 22 17:05:45 BST 2012
moving tracker functions into bt_tracker_client.c
improvements
Merge branch 'master' of github.com:willemt/YABTorrent
formating and define of resource and providers
the chef-client runs in two stages
update from localhost
Merge branch 'master' of github.com:williamjxj/Scraper
.mailmap: standardize identifiers for Joshua and Matt
add project_push,
add project_push,
add project_push,
repair a bug
repair a bug
a small modify
a small modify
a small modify
a small modify
a small modify
Use Heap to find Smallest kth elements
Pull profile image
Added blank slate for new users
Oops - texture load command went missing in a merge
Merge pull request #5 from yozlet/master

Fix missing textures
allow space in username (fixes #16)
Plugins: Element pos and userOff properties

Accept and return values in spatium units rather than raster
Changes are undoable
Changes to pos routed into changes of userOff
Plugin: make available Accidental.accType and Accidental.role properties and enums
fix default score when opening MuseScore
fix crash when editing drumset
fix #18396: Make Default Voice in Edit Drumset a combo box
Changes default lyrics style (odd and even) from top to base line alignment.

Also increases default lyric upper margin from 2 to 3.5
Merge pull request #102 from mgavioli/Plugin_accidental_properties

Plugin: Accidental properties
Merge pull request #100 from mgavioli/Plugin_element_pos_userOff

Plugins: Element pos and userOff properties
Merge pull request #103 from mgavioli/Lyrics_to_baseline

Fix 18407: Lyrics vertical alignment
fix MIDI import
fix test for midi import
fix simple text alignment
fix bad stems in beams: beware of float rounding errors
add layout test
changed index.php back to alices version
ZP-63 #time 10m


git-svn-id: http://svn.berlios.de/svnroot/repos/z-push/trunk@1236 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5
ZP-61
- fixed: inline image names with mime type for android devices

git-svn-id: http://svn.berlios.de/svnroot/repos/z-push/trunk@1237 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5
Merge branch 'z-push-1.5'
Mon Nov 12 18:01:02 CST 2012
Mon Nov 19 13:01:02 CST 2012
added JoinedDocCollector
cleanup
updated to build 2199
Corrected ubuntu installation
Add StopWatch for measuring code performance
added play to MatchPresenter
New gfx for the wiki.
Заголовки (h1-h6) теперь не жирным шрифтом. Рамка UI при фокусе жёлтая.
Перед запуском альфа версии сайта
stadir.c-init
added php code files
Change site style
weibo logindebug,input format check, weibo logout fix
removed css and jquery from noty
add org-checklist
Site updated at 2012-12-14 04:40:28 UTC
Mem*Services: use Guava Multimap and Table
Add picture of power.
Authorizer now registers with stack.io
Written test for ChangeNoteParentIdParameter
Improved camera tests by waiting for the viewfinder content to be ready.
Tweaked readyState value that we're waiting for to be more robust.
Merge pull request #20 from davehunt/fix-camera-tests

Improved camera tests by waiting for the viewfinder content to be ready.
Added Table of Contents to README.
Readme images and text.
Timer: fix error handling

Added assert macro verification
on callback function pointers.
Added 114x114 icon
changed bundle dir structure
move submodules to modules
add symlinks to current active plugins
finish the Solving linear system module
delete two no needed css files
final is fix
Fix student list alignment issue

- Fix student list header alignment in instructional materials
Merge InstructionalMaterials into AutomatedTests

- Merge branch 'origin/InstructionalMaterials' into AutomatedTests
Modify UI for Search Instructional material

- Display Sort search result option

- Modify UI for search results

- Change number of search suggestions from 8 to 6
Fix date alignment issue

- Fix date alignment issue in Instructional materials
Merge InstructionalMaterials into AutomatedTests

- Merge branch 'origin/InstructionalMaterials' into AutomatedTests
Modify visible columns from 4 to 6

- Modify visible columns from 4 to 6 in Recent Activity page

- Replace 'offering' with 'investigation' in messages
Change recent activity text messages

- Change recent activity text messages as per
  Frieda's request on Pivotal Tracker (story ID: 33229383).

- Update cucumber tests to reflect the text change.
Merge RecentActivity into AutomatedTests

- Merge branch RecentActivity into AutomatedTests
Add Pro3 and 4
Don't fail if sheet is not yet available
Completely remove the possibility of "mascot stacking"

Also add noface's vocaroo embedding
Fix light theme oneechan icons base64
Post form changes.
dialign complied ok
ff12345r5rq5595g67v156789526c67f5
Installed devise, add a user, etc.
changed ignore rule
improved 1007
cleaned the form -removed a dirty line of code that shouldnt have been there
- Add wrong parameters verification to SendMessageHandler
- Update web resources
implement PostToNewsFeedHandler in conformity with new JsonHandlerNew
Split company stage ready for design previews. Will start them tomorrow on the 27in
Added button to go on to next stage.
Improved input ui states
Updated company bio wording
Added in submit button and form values so validation works. Will probably swap that submit for a button
built sign-in button
Ok. Built add job page but stil
recent
fixed coflicts
switched daemon to production use and switched db to production
removed ALL the Heroku things
almost all links fixed!
couple unused methods
one more fix to tinymce setup error checker
Merge branch 'master' into kp-dev
fancy tag editor now has input validation
minor changes in jobscript
env: moved development `.env` out of version control.
git: update the ignores file.
edie disvote
[Bukkit] Fixed SpoutPlugin bindings issue.
Signed-off-by: Chris Sanders <NinjaZidane@hotmail.com>
Add "sudden-death" mode to LMS and LxTS modes when no humans remain.
Refactor and fix teamkill detection.
Fix new vpeers in HVC being unassimilated.
Add new Warlord mode.
Warlord suicides/teamkills now use a progressive punishment system.
Reduce the vertical spacing on stats screens.
Add missing l10n entries for WLRD mode.
Fix crash on joining WLRD game.
Fix vpeer superior list normalisation using internal peers.
Document frame recorder in README.
Edit possibly confusing wording for Debian/Ubuntu package names.
Reduce performance problems with cell creation brush on large ships.
Added corect project
[test] add a initial testsuite
[dist] version 0.2.0
Cleaned some md5sums in PKGBUILD
Ninjas and Teenage Turtles
Merge branch 'master' of github.com:AndroidNFC/movieapp

Conflicts:
	gen/androidnfc/movieapp/R.java
	src/androidnfc/movieapp/MovieappActivity.java
	src/androidnfc/movieapp/WebDisplay.java
	src/androidnfc/movieapp/XMLParserActivity.java
Bug with sin parser leading to error when flashing.
add: loader
mod: big refactor on the closest point and bounding volume demo
отчет по агрономии "Акт вып работ"
Merge branch 'master' of github.com:AramisIT/GreenHouse
11/10/12

mapsmobile beta
switches some prints to sys writes to prevent python from creating arbitrary spaces in the resulting html
jason added efficient add/remove option

for widgets and other menu graphics
Modify structure of compile options to support source map
trying to switch to dust instead of ejs
Replaced dust with linked in fork of dust

Replaced dust with linked in fork of dust
converted ejs template to dust syntax
moved all the math logic from the template into the controller
Reverted change since it didn't work
28/4/2012  1:10 AM
broken rowspans
added food support
nouvelle changement au niveau du séance
Merge branch 'master' of github.com:Bensalem/GestSalles
nouveau changement
Extra file containing ssh address
Salida sin mensajes extras. Y con fecha.
Output logging
Merge pull request #31 from BlueLemon/cron-logging

Cron logging
REMOVE: el orrible prawn.
ADD: odf-report
ADD: template para imformes
ADD: metodo para generar el informe
ADD: tema.to_s
REMOVE: saco el inicializador de prawn
ADD: expedientes templates
REMOVE: prawn
FIX: pongo los metodos para los listados en un arhicov separado.
FIX: paso los params por parametro
FIX: para que el inicio diga algo.
FIX: no tiene que mostrar la ley si es 0
FIX: filtro los expedientes en en controlador
FIX: modifico la plantilla de expedientes.
Merge pull request #35 from BlueLemon/odt-report

Odt report
FIX: pongo un limite para las impresiones de 300 expedientes. sino se cuelga la app
FIX: modifico el formato fecha
Rewrote config code
dealing with connection threading silliness in a different way
Removed code that adds 'address=' intercepts for a small list of domains to
/etc/dnsmasq.conf.include from NetworkConfiguration.configure_dnsmasq().

Added code to NetworkConfiguration.configure_dnsmasq() which adds a universal
DNS resolution intercept to /etc/dnsmasq.conf.include per issue #93 in the
Github tracker.  This isn't in the official documentation for dnsmasq (though
it should be); I found it in this post:

http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2004q4/000064.html

Signed-off-by: The Doctor <drwho@virtadpt.net>
compiled css
fixed margin left on masthead mods
slideshow h3 font weight of light
fixed padding top of first mod in sidebar2
fixed line-height of vmenu LI's
min height of 640px on #main .container
.char1 style

styles first letter of home page article
margin of 1em 0 on home h1
applied lettering.js on first letter of the home pages article
サボってないよ
ほんとにサボってないよ
こみっとできないんだけど
Doppelter Eintrag
Remove AM countdown.
commit 2 of branch 1
registered the lpdebug command
lol fail
fixed the commands
Add missing URL
added tests for partial selection option; added tests for HSL utility
functions
now you can't set partial HSL on the wheel while allowPartialSelection is false
Replace RobotoRegular with RobotoLight and RobotoLight with RobotoThin
Pass results back to worker as an object instead of a string
Format result output
- kernel-config-3.5-arm-realview: this now boots with:

   -M realview-pbx-a9 -cpu arm11mpcore -smp 2
worked on the single image fixes
changes for retina logos
Setup config.xml properly
Cleaned up the test for guess my number.
Fix locale misprint
Made options file a little smaller
Swtched to using new updatePlot1D(...) method.
Changes to stop Derivative dieing with 2D.
Removed Y3 and Y4
Add batch action path to root. Closes #1267
Update zh-TW locale
forcing to use formstatic 2.1.1 instead of lastest version
Updating hu locale
Add disable export in Index to documentation #464 [ci-skip]
Test index table sorting
ActiveAdmin sort order takes precedence over Model default_scope sort order

Closes #352
added new values to pt-BR locale
Fixed issue #1203: Admin comments do not work if config.active_record.whitelist_attributes is set to true
Removed comment from lib/active_admin/comments/comment.rb:14
use sqlite3 in favor of sqlite3-ruby
Add some missing Dutch translations
Added some missing spanish translations
use inherited resources >= 1.3.1
Added missing translations for the Italian language.
Merge branch 'master' of http://github.com/gregbell/active_admin
Changed map to show off different tiles
added listeners for events
modified README to hopefully, hopefully name changed this time.
Fixed janotor door and increased cart speed
removed lan/wan option for now because it is unused until we implement
myPlex
actually generate fibonacci list
vm1 config has localhost by default not android localhost
#67 Fixed disconnect token lookup.
#67 reconnect issues with LongPolling.
Methods are available for json in objective-c
Integrated import view
Removing isComponentDefined (part 2)
Added comment to explain what's going on
Added support of object.title to AS2KVL, renamed submit._getURL() to submit._getASURL()
"destroy" function tests added to the Control and Plugin classes
[CR] Echo.Plugin CR'ed
minor changes
starting again
m
adding excanvas support
More IE compatibility junk.
Varios Fixed Bug: En Presentacion Persona Juridica, Estilos del header.html, Copia del tipo de persona en PersonaFisica, y mas cositas menores
Splitted HtAccessDataParser and implemented Options- and
Order/Allow/Deny-Commands
Remove highlights in David's hair in team pic
validated the blog html
submit testing
rewriting polyfill
Add support for coroutines/greenthreads/userspace threads. TODO: make play with boehm.
Actualizo las entidades y el modelo para cuit pasa de bigint a string e
implemento ajax en subrubro
Left in a print. Oops.
removed non-commented debug echo
Small CSS update twitter turtle
Airport turtle
Parsed Out Admin vs User End Phrases
Submenus: el estilo de texto centrado se había roto. corregido
Removed command line arguments.
Removed unused dungeon code.  Removed languages (for now).
Fixed bug in writing tmx files.  Removed commented out code.
Merge remote-tracking branch 'upstream/master'
Fixing bugs in trigger serialization
Merge remote-tracking branch 'upstream/master'
Fixing off by one error in formatting
Adding back in underscore now that formatting is fixed
Fixing more serialization errors causing save/load problems
Merge pull request #31 from LtSquigs/master

Fix issues causing triggers to be serialized incorrectly
Using g++ for compilation. Fixed C++ build.
Fix Windows build
setting conn->must_close = 1; in handle_propfind()
Using MSG_NOSIGNAL in send()
Added check for the duplicate option
Fixed overflow in substitute_index_file()
Checking malloc return code in worker_thread()
Added new event, MG_REQUEST_COMPLETE
Added tag 3.1 for changeset b7f0feea998b
3.1 -> 3.2
Merge remote-tracking branch 'remotes/google/master' into google-unhacked
Fixed missing code quoting
better fitness parameters
phone line
Update licenses, fix typos and remove unneeded file
Fix compilation warning with gcc 4.7
DataExtraction.java was updated
Removed tags on display
Fixed screen gliding, need to add a fix for looking when the screen is repositioned. Something is wrong in 'Agent().look'.
WinGui: Fixes to the Advanced Panel (8x8t and ref) and Picture Panel (Further Max W/H fixes)

git-svn-id: svn://localhost/HandBrake/trunk@4907 b64f7644-9d1e-0410-96f1-a4d463321fa5
Merge branch 'master' of git@github.com:HandBrake/HandBrake
major change: images

reorganized images
got rid of the most sample images of IGE, left some for possibilities
rewrote routings in sources
major change: elevators

put in all elevator doors and a cart that moves now slightly up the
tower.
looks really great though for later control.
background, skyscraper and cart seem to move adequate
minor change: background

made it 200 pixels wider
Added gitignore
Cleaned up downloading data in parts

Moved duplicate code to a separate function
Cleaned up the imports
Changed generated filenames
Removes redundant `else: pass` statements

This resolves issue #3.
Created Tornado, works (kinda)

    Tornado is currently a heavy WIP. Partway through
    I realized that vectors applied to entities act relative
    to its position.

    There's some really bad math in there that I'm probably going
    to change a ton later, but this is my first effort at it.
Tornado now works, to an extent.

    I couldn't get good vector math to work,
    so I'm using just some "negate and reverse the values"
    math.
Tornado now actually uses a bit of trig.

    Horrible, horrible trig. Probably totally faulty.
Tornado now handles the spiralling much better.
Tornado uses a random vertical offset.
Tornado has random X,Y offsets.

    Moved height offset to a variable.

    Code is better commented.

    Removed old bits of commented out code.

    Commented out debug bits of code.
Refactored RADIUS variable in tornado to MAGNITUDE

    RADIUS is now used to determine the area around
    the player to affect entities, in the ratio 1:5:1
Fixed a typo in a variable name, oopsies!
Slight clarification in a mathy comment in Tornado
Tornado uses recursion, and comments must brag.
Started work on visual effects for Tornado
Wrote a quick "Gravity Field" spell. It's fun!
Commented out the visual effects for now.
GravityField range nerfed.
Gravity field now incrementally applies velocity.

    It looks much nicer!
Got rid of the old code in GravField
GravityField now has an ugly smoke effect
Merge branch 'develop' into feature-tornado
Change user_images template and view so users can click a button to send email report.
server should work now, not safe though
a few modifications in Prometheus + Integration of the home posters as a side-project
fixed DIC link
added some text, fixed goal collision
test
added logout
Update readme.md
Tweaked signup proccess. Last commit for the night
Commit
FUCK IT
test
Adds new site
DOTCOM-127 : fix issue on modification date, increment counter should not change it.
설문조사를 여기에 옮김
Paar Rechtschreibfehler behoben, ein Requirement hinzugefügt und die Beschreibung der Benutzerschnittstelle überarbeitet
Added unix-style Makefile
first attempt at index pages
Final Heroku fix. I hope
Finished signup
Added SSL to production
Modify filters again
Added water ripple to To-Do; Formatting.
Added map interiors for OLDALE TOWN, LITTLEROOT TOWN, and PETALBURG CITY.
Institution theme: publish date slider background color style fix.
Institution theme: added a beta notification overlay to be shown in upper left corner.
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/interface/themes/institution/header.tpl
Merge remote-tracking branch 'origin/master'
Fixed email from field label translation in MyResearch.
Added placeholders for content pages, added navigation links to all pages
Merge branch 'master' of https://github.com/KDK-Alli/NDL-VuFind
changed threading model
The Form
Install hybrid2 sample programs.
Fixed the mass calculation bug
Forgot about '’s

Signed-off-by: Kwpolska <kwpolska@gmail.com>
First commit of the responsive branch.
Merge branch 'Responsive-Experiment'
Added Bullet.PNG
1. Edit heading font. 2. Change sample database
Merge branch 'development' of github.com:LarngearTech/Zelfer into development
Change shadowing of thumbnials
Fix ajax update course thumbnail.
copy some aliases from @paulirish`s dotfiles
lee el sensor impreso desde puerto serial
Revert accidentally committed changes..
Renamed a few variables in LV::DFT to avoid confusion; properly limit LV::DFT output sample count, fixes crash in G-Force actor
Enable some ProcStat methods. Set preset layout to show vis behind lcd.
Plugins (Build): Remove outdated comment
Plugins (lv_gltest): Remove commented out gluPerspective() implementation
Plugins (lv_gltest): Make vertex array based rendering work again
Revert "Revert "i think i fixed it""

This reverts commit ecc2fd2d3721dd9d0336e300f0ee4653c1ed9d95.
Revert "Revert "nearly there""

This reverts commit 523e73318be0b94f256e26f38e3598fe585c7e36.
Revert "Revert "go go go! FIREEEEEE!""

This reverts commit 32b0339866bd46a3ad6bc68e06c85b3783104988.
Revert "fu"

This reverts commit 3b85a6885e760959b3bc0be70dccb5c021bb6813.
Revert "g"

This reverts commit 333e4d664d3055b6399f050ae72047836e8fdc44.
Revert "reorg classes"

This reverts commit ac8b8ec72fa7f216f626e5d803262978986ae485.
Revert "go go go! FIREEEEEE!"

This reverts commit 4c3bea4dc8d90cb21f70450560bb0226c02c8a14.
Revert "nearly there"

This reverts commit d87c240d03f663818ff6b78e58b8f72b71e9af5d.
Revert "i think i fixed it"

This reverts commit 712e166d685a2ba9c2a62eccf72433a08ced92bc.
Revert "ok"

This reverts commit cc9b92001cdd79fe03bad5337b644905960d4f02.
HttpHandler needs precondition for IIS Classic mode
Agregada la funcionalidad de que borre los archivos subidos una vez terminadas las pruebas
make sure we trigger build based on new kernel image; make sure we warn about depmod on target system; copy module to a subdirectory path in the modules
DocumentWrite escrito
DocumentWrite sin intermedio
[IMPROVEMENT] some (ugly) style on home page
Merge branch 'master' of github.com:MNCC/fr-mncc-geoloc
Added cancan to Gemfile.
Added methods to check if a user is on certian team

Also added admin team. Added ? methods eg `white?`
Started CanCan Abiltiy
Added some new CanCan stuff.
Relative position to li!
Add script link to index.html
Add script file to project!
Change left of li
Script for Effect of main nav!
Some Change!
+Fixed warning on line 245
-Removed obsolete function toVecs()
Better time visualization.
+Time2String function
interface for renderable objects implemented; rudimentary implementation of a player/guest
fix form (again)

in the fix for the role selector i set the role and user fields as required.
this had the bad side effect of preventing the form from beeing send although
there was no real input required.
Merge branch 'maint'
Merge branch 'master' into next
bootstrap的modal也改了……

Signed-off-by: Meathill <meathill@gmail.com>
cleaned up and packaged.
(partially) Solved 2 problem on interviewstreet
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	controllers/talk.js
	public/javascripts/main.js
	public/javascripts/talk-client.js
	views/index.html
Merge remote-tracking branch 'remotes/origin/master'
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	controllers/talk.js
	public/javascripts/main.js
	public/javascripts/talk-client.js
	views/index.html
Merge remote-tracking branch 'remotes/origin/master'
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	controllers/talk.js
	public/javascripts/main.js
	public/javascripts/talk-client.js
	views/index.html
Merge branch 'master' of github.com:MindCreator/chatnow

Conflicts:
	public/javascripts/main.js
bashrc & zshrc: use icanhazip.com instead of cadoth & mute curl.
Updated addCompoundFromHash for special case of recognizing protons
prefix in package documentation
new stuff incoming
Updated Decompiler to match VMs apis
Cleaned up permissions system a little, and added handler for users with insufficient permissions. Added logic preventing users from setting other users permissions equal or greater than their own unless they are an admin.
create_example_users.py now gets all usernames from the home directory of the current system. constants.py now defaults to using the fully qualified system hostname if the system is in one of the WWU CS labs.
Updated colours to match css
Merge branch 'cssfix'
Minor fixes related to pingback.
Сделан разбор. работает статус, серия, номер
Update nlsr.conf
disable neocomplcache auto insert delimiter
fix neocomplcache do not popup problem
change neocomplcache auto and manually complete length both to 2
migrate VimL settings into after/ftplugin/vim
add python visual execute and gf locate module/file
Merge branch 'develop'
adjust format of neobundle plugins
add plugin sparkup
disable many seldom-used plugins
update cscope settings
update vim tags settings by adding some tags files
change hlsearch toggle mapping
add plugin cscope.vim
add some wallpapers for Awesome
use init.el for Emacs
remove mplayer.sh script
change weechat startup join channels
disable urxvt transparent, use solarized colorsets
add Ruby RVM bin path into PATH
load Ruby RVM into bash session
add avatar, Nagato Pain (three difference size)
Merge branch 'develop'
add sendmail into installation packages
Merge branch 'master' into arch
set neocomplcache source tag_complete start length to 2
Add if exists() condition for UltiSnips <Tab> mapping.
add plugin easybuffer
add plugin VimLint
improve vim-ruby rubycomplete options
add neocomplcache force_omni_patterns for ruby
change custom fold style
disable smartindent and expandtab, learn from VimLint suggestion
Merge branch 'develop'
Merge branch 'master' into arch
note when TAG_End occurs unexpectedly
It would help if I read the values.
Don't copy the chunk just to save it
Addendum to previous submission.
Two further basic functions for rooted trees.
Further basic functions regarding the Calkin-Wilf tree.
changed the way annotate light mode is working, now it's using overlay windows instead of new browser window
More comments

Added more comments to the timeClock function.
fix a bug in dataVersion
Par ce qu'avec les fichiers STL c'est mieu
cleaned up and fixed up commenting on Xresources, bash config, awesomerc, screenrc, vimperatorrc, tmuxrc, and hardlink hook init script
fixed up zsh prompt a bit and cleaned up comments in zsh config
removed git hardlink wrapper, added script to hardlink all files, and added a script to make a number of git hooks to call the hardlinking script
cleaned up loadkeys/kernel keymaps and X keymaps
added screen, readline, and keymap sections to readme
outras telas home
Added draw option
This file was also changed by import_cldr.py
Readme updated
tests 6+7 (textures + async shader loading)
additional cabal modification
renamed cabal file
modified copyright to adhere to the LICENSE file
added homepage and package-url
added GHC ==7.0.4 to the tested-with field
document StremErrorCondition
some minor documentation improvements
Preliminary fire spreading working
Units can die

Signed-off-by: Fraser Sharp <fraserrsharp@gmail.com>
Update src/com/porknbunny/onmyway/SearchFragment.java
fix NPE when value of WeakHashMap are released
Fixed plugins expiration code and updated version
[i18n] update .po generation date
[enh] dummy tastypie api to expose our datas
[mod] add tastypie to requirements
ripd: dismiss remnants of obsolete RIP commands

RFC2453 3.6 says, that the only valid command codes are 1 (request) and
2 (response). Command codes 3, 4, 5 and 6 are unsupported and don't
require any special treatment. These are removed.
MiViaje Login
eluaatin muokkaukseen vanhat tiedot
try to fix remove bug
one-size-fits-all formatting implemented
display formats assigned at metric creation
skeleton
no components needed here
add two files for start android emulator
1. add header information
2. do not execute 'cp'/'mv' command on error
3. using internal comment text instead of reading from a sample makefile
get cucumber tests fully written and working
define csel
Merge pull request #1 from RobotK/master

Fix for null pointer dereference warning.
-Ip format
-Max rotation
Update src/net/kitecraft/tyrotoxism/gates/Gates.java
stated with sem task 2 exercise 3 and 4. Namecollision with prelude
bug fixes

about city upload picture bug
delete posts bug
SQL UPDATE + READ CLASS
Fixed issue: RemoteControl add_response not working
New feature: Added subquestions, attributes, attributes_lang and answeroptions properties for RemoteControl get_question_properties
Updated translation: Czech by slansky
Updated translation: Danish by docl
Updated translation: Dutch by mdekker
Updated translation: Polish by elisa
Updated translation: Portuguese (Brazil) by wagner, arthurassuncao, mauriciofurtado
Updated translation: Turkish by kayazeren
Updated translation: German (Informal) by c_schmitz
Fixed issue #6752: Misspelled word
Updated translation: German (Informal) by c_schmitz
Fixed issue #5907: User first see filtered question, hidden after by javascript
Dev: only fix first part of bugs
Dev: tested ls2_validation_tests.lss in 2.0 : betwwen 1 and 2 s to load, same think for 1.92.
Fixed #6644: Creating PDF statistics containing questions of multi numeric value type cause infinite loop
dev: minor fixes for statistics browse of selected responses
dev: installer lost some styling, added a little but can probably be improved
dev: survey model returns the right class for code completion, token field left out of fieldmap when no tokens used
dev: prepare export to handle other than predefined formats + fixed remotecontrol incorrect call
dev: remotecontrol example code throws an error
Fixed issue: memory_limit setting being ignored
Merge remote-tracking branch 'origin/master'
Dev: Fixed a small bug
Fixed #6761: Remote control demo is not working
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey.git
dev: allow remote control test for both interfaces
dev: started on reflection to show available methods
Updated translation: German by c_schmitz
Updated translation: Greek by mele_lime
Updated translation: French (France) by DenisChenu
Updated translation: Norwegian (Bokmål) by peterhol
Updated translation: Serbian by MilaVeljovic
Updated translation: Turkish by kayazeren
Updated translation: German (Informal) by c_schmitz
dev: updated https://github.com/LimeSurvey/LimeSurvey/commit/501d7aaea7d69dc5ecf807b8c6089f513758a276 to be specific to the progressbar
Fixed issue #6757: Double encoded quotes in hints for "other" selections within multiple choices
A small correction for audio item design... strange, it was good on windows and linux, but works not the same on mac.
some fixes on mac for issue 1164
Fixed crashes after erasing some strokes and undo.
fixed google image search
changed commit name
new style for contraste widget
Sankore-958 recursive fix
using utf8 string to keyboard languages
made session-long "Idx" index
Merge branch 'master' of github.com:SashaCrofter/distru into server
Time format convertor, mean up/down time (unfinished)
SimonStewart: Default to assume that the zoom level hasn't been modified.

git-svn-id: https://selenium.googlecode.com/svn/trunk@17717 07704840-8298-11de-bf8c-fd130f914ac9
AlexeiBarantsev: Setting default hub args to the empty list, instead of null, to prevent NPE, Fixes issue 3306

git-svn-id: https://selenium.googlecode.com/svn/trunk@16900 07704840-8298-11de-bf8c-fd130f914ac9
Begin Odin.
Removed odin for now. I'd like to do some more tutorials on android first.
Here for the lazy guys.
Core/Player: Send calendar raid lockout remove before removing player from instance save (may invalidate instance save)
SQL: Renamed files to match the order they were commited in.
DB/Loot: add Bogblossom to Bogblossom object, thx Helias

Closes #5922
Core/Spells: Corrected logic check for SPELL_ATTR4_IGNORE_RESISTANCES

Signed-off-by: Subv <s.v.h21@hotmail.com>
DB/Loot: Add some missing loot definitions to prevent some startup errors
Fixed build from my previous commit
Core/Spells: Fixed Bloodworm's heal effect and damage
Closes #1808
Thanks @A-Metaphysical-Drama for the damage part
Signed-off-by: Subv <s.v.h21@hotmail.com>
Core/Scripts: Added support for creating custom GameObjectAI classes, similar to how creature scripts work.
Spells/Bonus: Fixed spell power bonus of Lava Burst, taken from DrDamage and verified
Closes #1819
Core/Scripts: Corrected previous commit and added a few AI hooks to GameObjectAI
Spells/Procs: Fixed Sacred Shield 6 seconds internal cooldown.
Thanks @Warpten
P.D.: You were using the wrong spellid
Closes #1711
Core/Spells: Dont remove auras on stance change if the stance you are moving to is also allowed by the spell.
Closes #2758

Signed-off-by: Subv <s.v.h21@hotmail.com>
Merge branch 'master' of git://github.com/TrinityCore/TrinityCore

Fix Conflicts:
	src/server/game/Entities/Pet/Pet.cpp
Merge branch 'master' into AC2
fixed CS
changed the autoescape option to also accept a supported escaping strategy (for BC, true is equivalent to html)
added a way to dynamically change the auto-escaping strategy according to the template filename
tweaked an error message
simplified usage of the autoescape tag; the only argument is now the escaping strategy or false
tweaked doc for the escape filter
added a way to change the default escaping strategy after creating the Twig environment
simplified code
ensured that each template (Twig_Node_Module) is only visited once
added a note about auto-escaping and the embed tag

We cannot use the parent template to guess the auto-escaping strategy
either as it can be any valid expression, for which we have the real
value only at runtime (auto-escaping happening at compilation time).
made the autoescape tag argument optional (defaults to 'html')
fixed embed compilation when used more than once in a template (closes #714)
added a new recipe
tweaked doc
refactored the hacking twig doc chapter
renamed a doc file
merged two doc files
fixed markup in the doc
added a missing entry in the CHANGELOG
Merge branch 'master' of https://github.com/fabpot/Twig

Conflicts:
	doc/advanced.rst
	doc/api.rst
	doc/filters/escape.rst
	doc/index.rst
	doc/tags/autoescape.rst
	doc/templates.rst
	test/Twig/Tests/Fixtures/tags/autoescape/basic.test
	test/Twig/Tests/Fixtures/tags/autoescape/blocks.test
	test/Twig/Tests/Fixtures/tags/autoescape/double_escaping.test
	test/Twig/Tests/Fixtures/tags/autoescape/functions.test
	test/Twig/Tests/Fixtures/tags/autoescape/literal.test
	test/Twig/Tests/Fixtures/tags/autoescape/nested.test
	test/Twig/Tests/Fixtures/tags/autoescape/objects.test
	test/Twig/Tests/Fixtures/tags/autoescape/raw.test
	test/Twig/Tests/Fixtures/tags/autoescape/strategy.test
	test/Twig/Tests/Fixtures/tags/autoescape/type.test
	test/Twig/Tests/Fixtures/tags/autoescape/with_filters.test
	test/Twig/Tests/Fixtures/tags/autoescape/with_filters_arguments.test
	test/Twig/Tests/Fixtures/tags/autoescape/with_pre_escape_filters.test
	test/Twig/Tests/Fixtures/tags/autoescape/with_preserves_safety_filters.test