labofsahil/github-event-dataset-2012 huggingface dataset:
Merge branch 'android-render-fix' of http://github.com/slygamer/MonoGame into slygamer_android-render-fix
Avoid exceptions when resuming and GL context was lost on Android
Made landscape games work again on iOS 6
TODO: GameCenter requires portrait to work without crashing. Find a way to prevent the game from rotation to anything other than landscape.
Clear SamplerStateCollection and TextureCollection when device is initialised.
Clear GraphicsDevice._enabledVertexAttributes so they get re-enabled.
Added support for the orientation mask
We should not get the allowed orientations from the Info.plist anymore as it will use AllButUpsideDown for iPhone and All for iPad
Reset some more state variables in GraphicsDevice.Initialize()
Clear constant buffers when DeviceResetting
Merge branch 'develop3d' of http://github.com/mono/MonoGame into fixing_android_texture_reloading

Conflicts:
	MonoGame.Framework/Graphics/Shader/ShaderProgramCache.cs
Fixed Android texture reloading. Needed to GL.GenTextures and set up GL.TexParamaters again.
Revert GraphicsDevice.Initialize() to internal
Complete for for iOS6 and iOS5+XCode 4.5 compatibility
Merge branch 'develop3d' of https://github.com/mono/MonoGame into ios6
Some more changes after updating to iOS 6:
TouchPanel's touch scale is set incorrectly at startup due to iOSGameWindow client bounds reported as portrait
Fix the compile error after the removed parameterless constructor of matchmaker, also add some core functions there
Made iOS compile again after the previous merge
Merge branch 'develop3d' of http://github.com/mono/MonoGame into fixing_android_texture_reloading

Conflicts:
	MonoGame.Framework/Graphics/Texture2D.cs
Merge branch 'develop3d' of https://github.com/mono/MonoGame into ios6
Fixed missing clamp from color multiply
Merge pull request #818 from Nezz/color_fix

Fixed missing clamp from color multiply
Move DeviceResetting event and GL context lost detection from OnRestart() to DestroyFrameBuffer().

Thanks to @slygamer for this fix. It makes more sense and is the correct place to call DeviceResetting (ie before the device is actually reset).
Avoid changing orientation whilst the screen is locked.
Fixing glitch with musip
#349 Experts: Closing main window allows switching to another storage directory
Requesting focus on list upon opening so keyboard works.
Merge pull request #369 from demaagdk/feature/updateTimestamp

Issue #367
Merge branch 'develop' of github.com:ingenuitas/SimpleSeer into feature/hostConfig
Usuarios. Alvaro Vasquez
add definition for fdc
adding a test to show that merging can be disabled using `'HelperName' => false`
ruby 1.8: puts nil prints out nil, was depending on ruby 1.9.3 behavior to not print anything
added ByteUtils
Making sure that probabilities work for DNA sequences too, shifting to Myers/Miller alignment algorithm for DNA sequences or big datasets.
prototype 5.1
prototype 5.2
Update 0.5.01b Snapshot

Hoppefuly all bugs fixed
detalhes.html incluido galeria
add dirlistpanel as filterable window type
article semantic tag
Added F9-Key for Ruby-Syntax-Check, MBE Option set
Merge branch 'master' of github.com:dinfuehr/vim-config
provided simple list view (to display similar events in same event category), and fixed faulty contextual filters in views
adds translation for "Twitter"
Completed with Manage State, District and City module. The modal based
addition for State, District and City records is pending. Bank module is
added and integrated end-to-end. Need to handle exception scenarios and
searching mechanism.
debug of an0~an3
key bind
Renamed to posets
update to jquery-1.8.2
update to three.js 51 and add frustum
add tmp directory
add connect-rjs
add jshint and colors
commentout for connect-rjf
Implemented a 'position' module to handle changing item positioning in
the animations, and soon drawing, modules. Added up/down links on the
animations items.php page to trigger.
Removed an extra getLine as part of getUserMove
share icons.
bug fix.
Added backlog of posts. Fixed small issue with popup style
More updates to .vimrc and .gvimrc
get timeline functionality added
added followers and friends
HOPKINS: Correct video decompression methods
HOPKINS: Fixed Copy_WinScan_Vbe3 method
HOPKINS: Implement CREDIT_AFFICHE()
Compiled on Dave's workspace; added cEntity
cEntity is a base class for all renderable/interactable items on-screen,
moveable or not
work finished up to adding molecules part
upgrade to Drupal 6.21
upgrade to Drupal 6.22
upgrade to Drupal 6.23
upgrade to Drupal 6.24
upgrade to Drupal 6.25
upgrade to Drupal 6.26
New class TriggeredScope which is lie AudioOscilloscope but always starts on a rising or falling edge. Fixed some compiler warnings in clang. Added Q parameters to BiquadFilter making low and high pass resonant. Fixed some conditional compile flags.
If I can lose the method_missing, this will actually be unintrusive now!
hello jenna
Use postgres instead of mysql
issue #1486: CCDirector::getWinSizeInPixel return 'winSize* CC_CONTENT_SCALE_FACTOR()'. This change fixes the wrong display bug in CCRenderTexture.
Adding xnitirc and Xresources files
Renaming Xresources so it is not a hidden file
Adding awesome rc.lua and basic first theme
removed the autoloader service (use composer instead, closes #205, closes #176)
added instructions on how to install dependencies need by each provider via composer
deprecated the phar
added more information about how to install Silex
added the script to build the zip/tgz
added a Twig example for the service
tweaked previous commit (closes #219)
Updated validator doc to show validation in YAML files
Merge branch 'tmp'

* tmp:
  Updated validator doc to show validation in YAML files
moved previous doc changes to a cookbook
added a way to register translations when the domain is not the default one (closes #185)
first commit
Merge branch 'master' of https://github.com/dxwils3/pickle_pipe
moving over some pre-existing files
removed .DS_Store
Merge branch 'master' of github.com:dybskiy/redactor-js
add tu/fav/tweet relationships, create tweets and favs during crawl
allow invoking of crawl via browser
Add homeproxy to the repository.
chosen-js for multiple countries working

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs@18793 a0171fae-0946-0410-966d-b1775066cd26
Add indicators select

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs@18794 a0171fae-0946-0410-966d-b1775066cd26
Necessary static files

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs@18795 a0171fae-0946-0410-966d-b1775066cd26
Added languages to "Languages of publication", div class="field" on widgets

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs@18796 a0171fae-0946-0410-966d-b1775066cd26
Chosen select for languages of pub.

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs@18797 a0171fae-0946-0410-966d-b1775066cd26
Fix text in languages select

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs@18798 a0171fae-0946-0410-966d-b1775066cd26
Change name field label to Title

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs@18799 a0171fae-0946-0410-966d-b1775066cd26
Include focus and indicators in <thead>

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs@18800 a0171fae-0946-0410-966d-b1775066cd26
SEMIDE FlashTool handlers bugfix

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs@19057 a0171fae-0946-0410-966d-b1775066cd26
Refs #882; Added two new utility functions. Updated logger format.

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs@19058 a0171fae-0946-0410-966d-b1775066cd26
Fixed spec for new urls

Url changed in 789719b
Decrypt for 1.9.x
Better validity check
Exceptions ftw
#177 save last play info before media changed
Merge pull request #178 from ebencheung/SaveLastPlayInfoBeforeMediaChanged

Fix #177 save last play info before media changed
linkfix for doc/samples directory
Force portrait orientation on small screens

This is more or less me being lazy and not wanting to deal with orientation
changes on phones right now. Perhaps in the future I'll return to this issue
and properly address it. (But really, who switches into landscape on a tiny
screen, anyway?)

Signed-off-by: Eddie Ringle <eddie@eringle.net>
Force a single target fragment container on small screens

Signed-off-by: Eddie Ringle <eddie@eringle.net>
Going up should just simulate a back press, for now.

Signed-off-by: Eddie Ringle <eddie@eringle.net>
Force home action to be displayed as an up action by default

Signed-off-by: Eddie Ringle <eddie@eringle.net>
Add FollowersFollowingFragment

Signed-off-by: Eddie Ringle <eddie@eringle.net>
Make gravatar in event item link off to the actor's Profile

Signed-off-by: Eddie Ringle <eddie@eringle.net>
arregle hola

arre
scroll conte sua historia
Merge branch 'master' of github.com:edse/cmais-frontend
correção do texto
Merge branch 'master' of github.com:edse/cmais-frontend
added matrikelnummern
fixed login with the same twitter user but different browser
better rope sprite
searching for :top works as expected: 
the query: (path :top) returns all results that have
any value (except nil) for the path.

For now, query (path "top") works the same, since mongo is returning keywords as strings.
fixed var name, function sig
fixed indentation; fixed args for sign() call
*
warmup done
computeCost done
Remove old javascript indent packages
Testing Cubiq SwipeView
Working Test
Vertical scroll/initial image loading

Vertical scroll only working for Chrome OSX with touch enabled
El footer se adaptar mejor a pantallas mobiles
Adding Amazon S3 class from git://github.com/mackstann/amazon-s3-php-class
ld/
	* ld.texinfo (Options): Describe -Trodata-segment.
	* ldlex.h (enum option_values): Add OPTION_TRODATA_SEGMENT.
	* lexsup.c (ld_options, parse_args): Handle -Trodata-segment.
	* scripttempl/elf.sc (RODATA_ADDR, SHLIB_RODATA_ADDR): Wrap
	SEGMENT_START("rodata-segment", ...) + SIZEOF_HEADERS around the value.
daily update
Moved to old docs directory.
coffee is a new ACK type; configured ack to search all files by default
fixing views for banner zones
[#ENYO-935] Added a "New kind" button in code editor
[#ENYO-935] In designer, allow to drop a very first component into a kind without any existing components
Merge branch 'master' of github.com:enyojs/ares-project into ENYO-935
[#ENYO-935] In designer, reflow the toolbar when a kind is selected to avoid
having "Code Editor" button out of screen when a kind with a long name is selected.
Merge pull request #30 from enyojs/ENYO-935

ENYO-935: Added a "New kind" button in code editor and allow dropping a first component in designer
updating for sm purposes
Handle tags with period characters

Match the whole tag when the tag name contains a period.  Currently a
start tag <foo.bar> gets closed with </foo>.
Midway through Ch. 6
Make a basic User model (including secure passwords)
used signalAll() instead of signal()
- otherwise a wrong thread may wake-up and go to await() again
- added an unit test to verify the bug
simple insert is working
Improvement of dist and myconfig-final.h.
Prevent rebuilding of version.txt in distribution package.
Leave out the documentation sources from the distribution package. Fixes
make doc in dist package.
Clean up bond interaction docs.
Small fixes.
Fixed generation of myconfig-sample.h.
added version factory method
Removed devserver from installation applications
Fixed plural text
Added south migrations
Removed linkage to sourced model from medicine and added a name field
Added manufacturer to product
Added msh import script
Added dataimports app
Added vim swp file to .gitignore
Removed sourced model parent from a number of models
Catering for missing countries in unicode method
Added a procurement import command
Country names for bar graphs now extracted dynamically
Minor modications to domain models
Procurement import now copes with missing manufacturers and suppliers
Add unit-test to reproduce encoding error.
fix propertyignored
Fix for Eucaops when passing in config_file and password
Merge pull request #67 from eucalyptus/testing

Fix for Eucaops when passing in config_file and password
force IE to use edge mode in web.config so styles and everything else works
Make some of the reactive examples a bit prettier.
add google Analytics
enable scrolling in lightboxes/fancy
redesign init functions (not all data, each ajax request)
enable ajaxpaging in normalpage and lightbox at same time
README layout change ;)
Adds space between the signup form and the footer. Adds a warning to put the mixin in its own file.
Fixed miscellaneous eclipse errors
COMMONS-208: remove provided scope
ui-common/src/main/java/org/exoplatform/selenium/platform/ks/Wiki.java
SOC/FQA-478: [SELENIUM] SOC - Space - Module community
Merge in Bogdan's fixes to adding groups, but still using ARC for now.
Remove script to publish site - was incorporated into build.xml
Support images within the project query. Fix the path lookup on the projects.
Merge branch 'support-images'
Make it so we don\'t have all the debug output.
Ignore some files
Code to make it easier to add different types of files to the project
Supress the output
Just as with groups, to resolve source files, we need to pay attention to the sourceTree attribute, if SOURCE_ROOT, then the path/name is from the project root, so we do not look at the parent group
Merge branch 'fix-source'
Ignore OS X Finder DS_Store files
Merge branch 'master' of github.com:expanz/xcode-editor

Conflicts:
	Source/Main/xcode_FileOperationQueue.m
Merge branch 'master' of https://github.com/hiddenmemory/xcode-editor

Conflicts:
	Source/Main/xcode_FileOperationQueue.m
	Source/Main/xcode_Group.h
	Source/Main/xcode_Group.m
[+] Setting joelang_LIBRARY_DIRS on windows
[~] Allowing evaluation of non-const expressions
[+] Completed GetUnderlyingType
[~] factored out common code
[+] Created tests
Added many options for name inheritance and name statistics.
Update for cython branch of Adolphus.
Add raw triangle mesh scaling/offsetting script.
Bootstrap scaffolding, minimagick
fichier ok pour rendu
code is on github now
up to version 0.2.1 .. include tweepy
Añadido documento txt con instrucciones para desensamblar código.
Put class names in +allClasses
make html5 location stored in cookie
Added a comment that explains why the pixel are grouped together
Moved the changelog one directory up
Fixed typo
Fixed a bug that caused a wrong grouping of the pixel in the graphic buffer.

This caused a very heavy bug so that everything was the same color.
Fixed changelog path
Release of version 1.1.2
Refactoring - add construct with $wwwDir parameter
Remove registration of class for latte helpers
Update README.md grammar

copy editing and just a few housekeeping items to help clarify the documentation.
Merge pull request #81 from creatovisguru/master

Correcting documentation grammatical issues and typos
take out the branch info from commit -s
don't use dot to access collection, for avoiding special character issue
frameworking
Add ciphers, almost done EncryptedFile format.
Working on ASP.NET Menu tool
Update libquicktime to 1.2.4 (required for compilation with recent ffmpeg)
replace carriage return (ugly code could be improve)
Fix closing tag in definition list helper.
Add .gitignore
ignore eclipse files
Add example logback001 and logback002
Merge remote-tracking branch 'upstream/exp' from showp1984
- Merge the following from the English version:

  	r10204 -> r10210	head/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml

Submitted by:	Hiroo Ono <hiroo _at_ jp dot FreeBSD dot jp>
Reference: 	[doc-jp-work 1862]
- Remove the outdate sound chapter [1]
- While here, fix some inconsistencies

Discussed with:	ebrandi [1]


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@39611 ba62deef-0ea0-e111-9166-001e4f0fb9b1
- Remove stale files

Discussed with:	bcr


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@39612 ba62deef-0ea0-e111-9166-001e4f0fb9b1
Added the logic to use the xpm_config_prefix over the default prefix
provided no --prefix= option has been specified on the command line.
working on isDisplayed. It seems using the remote object id instead of nodes idea was a bad idea.
refactored to have node id instead of object id.
stale about to work.
fewer "bob smith to bob smith via wall-to-wall".
typo on previous checkin - set max number of images for an inserted link, default 2.
nav: pass $baseurl to template
quattro: some updates
- add makefile to rebuild both css with single command
- fix icons in Forums widget
- style photos pages
quattro: fix Forum widget, hide edit profile link
Merge pull request #368 from fabrixxm/master

Some work on quattro
missing close double quote in mail_list.tpl

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
Merge pull request #139 from simonlnu/master

missing close double quote in mail_list.tpl
Opetovne povoleni markupu v clancich
Merge branch 'release/0.9.49'
Agregar refund
Fixed images on about page.  Adding delayed jobs for bg job processing.
updates makefile
updates doc and tests
adds missing docs
updates gitignore
forces enums to be treated as ints
adds more classes
updated configuration reference
Add channels configuration to the reference
Add a cookbook entry for Monolog: channels/handlers
added info about when the symfony.com is updated
Merge pull request #1328 from symfony/doc-update

added info about when the symfony.com is updated
Write "Use virtuals forms" cookbook
added some more info about how to contribute a patch
refactored the code contribution chapter and added more detailed information about the process
Removed now irrelevant paragraph
Merge pull request #1335 from richardmiller/cleaning_up_di_definitions

Cleaning up di definitions
[Book/testing] Added a missing > at the PHPunit configuration code
Added setAuthenticated method call in Custom Authentication Provider
Added page on service container compilation
Fixed link and added to index
Moving di articles from cookbook to components
added doc for cache service type
fixed misspelling
Fixed sidebar directive
[2.0][Workflow][New project git] info about lock
init cookbook entry about apacher router, using comments by @jalliot from #521
add timout again
add screen 9
dropdown for toolbar and adding fork of patterns library
cleanup authentication functions in apps test
remove dependency on asi-http-request folder structure
Modify rake.vim to exclude vendor directory.
Partial complete move to info header
task 9: Force apt-get update after adding repo

First trial


http://github.com/gbatalski/jclouds-plugin/issues/issue/9


Signed-off-by: Ghenadii Batalski <Ghenadii.Batalski@student.kit.edu>
add color manager
update
Merge remote-tracking branch 'origin/master'

Conflicts:
	Draw/Dice/Controller/Room/DiceRoomListController.m
add files and fix bugs.
update word
move delete paint image to background deletion
Merge remote-tracking branch 'origin/master'

Conflicts:
	Word/Word_En.txt
	Word/Word_Hans.txt
update
Merge remote-tracking branch 'origin/master'
add HKGirlFontLabel
add hkgirlfontlabel
Merge remote-tracking branch 'origin/master'
update invite users.
Merge remote-tracking branch 'origin/master'
Added AI Snakes to the menu and changed snake generation to make it more friendly to generating multiple snakes on screen.
Changed various code in XYVHead to allow above change.
Changed title to TailSnake to better represent the nature of the game and added small description to load page.
Fixed accidental bug of setting the window height equal to Game.WIDTH :/
Fixed test spacing issues created by the above change.
changed the update in ActionAdapter to be abstract again
added a possible way to do the bitmapfont scale but commented for now
Merge branch 'master' into latestlibgdx
removed some empty lines and applied formatting
Merge remote-tracking branch 'origin/master'
changed entitycomponentsfactory to use randomaccessmap, fixed randomaccessmap to return the correct value on remove, added test for that change, fixed renderlayerspritebatch to use the new randomaccessmap in entitycomponentsfactor
Merge branch 'master' of github.com:gemserk/commons-gdx
fixed some javadocs on script class
changed script system to use the new randomaccessmap in entitycomponentsfactory
changed Script interface init method to be named enabled() and dispose method to be named disabled()
Merge remote-tracking branch 'origin/master'
added calls to script.added and script.removed to ScriptSystem
changed lots of systems to use the new randomaccessmap in entitycomponentsfactory
Merge branch 'master' of github.com:gemserk/commons-gdx
modified all components to use the typeId of the ComponentType instead the type itself, modified the PreviousStateSpatialSystem to cache the components of the entity to improve performance
removed commented old code of process(e)
modified renderable comparator to have a entitycomponetns and a factory and modifeid also the orderedbylayerentities to cache the components of the entity to improve the getComponent calls
extracted GlobalTime.getDelta() to be performed once oustide the entities loop
Merge branch 'master' into latestlibgdx
removed more unnecessary code from site.css
add datatables dependencies
add datatables assets
add datatables view for model
use bootstrap pagination style
update styling for model datatable
bring over custom style from dgidb
genericise a datatable class
haml-ify this
remove PP-specific bit, make case INsensitive
add processing profile datatable
add subject datatable
remove duplicate js code
add browse sidebar
add instrument data
add sample browser
Renomeando extensões de arquivos apenas para consistência
Detect broken implementations of custom marshalling

A command with marshal_dump() but without marshal_load() will be
rejected immediately, instead of failing on log replay.
updated fixtures
updated fictures from web version
Missing patches when joomla-CMS was moved to github
Update changelog
[#26929] *Unique alias & Unicode alias issue
[#26937] Bluestork tabs fix when more than one row of tabs
[#26910] view metadata.xml isn't considered for parameters
Changing mode
[#26904] JDatabasequery work in com_redirect and com_search
[#26898] JDatabasequery work in com_newsfeeds
[#26896] JDatabasequery work in com_users front end
 # [#26972] Small regression rev. 22054, skipping translation in
<description>, + BC 1.6.x issue. Thanks Cir Tap
[#26885] JText do not recognize "" no-string. Thanks Christophe
 # [#26491] Date Icon "string untranslated". Thanks Christophe
 # [#24973] JHTML select.options with html entities. Thanks Pavel and
Bill.
[#26897] JDatabasequery work in com_plugins
 # [#26977] *Multilanguage: adding custom Site Name per Content Language
Upgrade trunk to 1.7.2
 + Adding Austria and Switzerland flags for mod_languages
 # Modifying version.php to 1.7.2
[#25031] Support Forum URL as language file option
Correct typo in CHANGELOG
Add user_show and user_edit to precompilation
* Source/GSThemeDrawing.m (-toolbarBorderColor): Change default to
[NSColor darkGrayColor]
* Source/NSToolbar.m (-initWithIdentifier:): Call
[self setShowsBaselineSeparator: YES] by default so the toolbar has
a bottom border.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@34983 72102866-910b-0410-8b05-ffd578937521
empty lines not included in levels
support incomplete lines
final commit tonight, need to complete html5 parsing
modified:   hello-git.sh
This ws pushed from another local repo'. Just testing out some Git features.
fix coral cdn in context menu
missing import of socket after dnsutil split
bin2addr method never used
complete test coverage for dnsutils
continued work on indicating progress, and running multiple sessions.  Currently sessions are run in loop, but could be done concurrently.
This commit resolves issue marytts-it/marytts#25
Start modifying SPEA2
add ubuntu-init
An optional third argument added for initial term
new questions
Merge pull request #254 from abhinavc/master

new questions
osgdb_assimp: propagate osgDB::Options through to texture read call
update hdiehigo
remove weirdly named rvmrc
Sqlite3 is only for dev and test
add pg gem to Production in Gemfile
Document sensors usage

Closes #68.
made email field mandatory in user edit
added wikimarkup support
updated requirements
added support for SASS, SCSS, Haml from Tim Pope (thanks Tim)
added HAML, SASS, SCSS support
jekyll aliases
修复发布以来收集到的十来个bug

0. 修复使用虎牢关点将卡变身后势力没改变的bug (顺便把变身后的性别也调了下)
1. 调整: 虎牢关的胜利(包括虎牢吕布)都计算入武将的身份胜利统计里面，否则虎牢布拿不到30胜的战功的
2. 改进：修复技能卡的技能选项中会出现自己武将已有的技能的问题(比如孙权的技能卡选项中出现制衡)
3. 张辽： 掩其无备 无法拿到的bug
4. 曹操: 乱世的奸雄 无法拿到的bug
5. 夏侯渊：风驰电掣 无法拿到的bug
6. 公孙瓒: 白马义从 无法拿到的bug
7. 3v3 一鼓作气 无法拿到的bug
8. 1v1的巾帼英雄, 有勇无谋，智勇双全，护国军师这四个战功无法拿到的bug
9. 张颌： 变拙成巧 达成有bug
A. 二张: 辅吴将军 达成有bug, 蔡文姬武将战功达成有bug
B. 孟获: 七擒七纵 达成有bug, 曹丕的武将战功达成有bug
C: 狗屎运调整，原来扣除的逃跑次数是所有牌点数之和，现在调整为一个随机数
D: 手气卡调整，原来是无限制使用，现在是初始送你100张手气卡，以后赢一局可随机奖励 1~3个手气卡。
E: 武将的30胜，以及其他身份的N胜等战功，优化加强，确保你不会错过
一些界面上的小调整
Signed-off-by: haveatry823 <401068081@qq.com>
Javadocing.
Merge branch 'master' of https://github.com/haydnnewport/doHARM.git
Added rcfiles subdirectory, along with tmux.conf
Added docstring to match_action
Don't hop to the first enclosing, non-silent context when typing refinements.

Closes SI-5305.

This reverts a few lines of e5cfe47a19, which was a remedy for SI-3614 and SI-3856*. I added a test case for the former, the
latter was already tested. Both tests pass after this change, and they do so with the old and new pattern matcher.

But does this change still "avoid trees with null types in presentation compiler"? What was the intent of the context hopping in the first place?

* Based on this comment: https://issues.scala-lang.org/browse/SI-3614?focusedCommentId=50477&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-50477, which elaborates further than the commit comment of e5cfe47a19.
Add more logging.
Fix SI-4928

better error message when a parameter is first defined positionally, then with a named argument.
Fixes SI-5623 on SyncVar and deprecates set & unset.
Test case for SI-3844 - fixed by #virtpatmat @adriaanm
Merge branch 'master' of git://github.com/scala/scala into issue/5623
Missed a stash
SIP-14: clean ups and fixes
An IntelliJ module for test files.

This enables resolve, autocompletion and the usual goodness
when editing tests.

Also removes the sample configuration for the defunct dbc module.
Merge pull request #561 from retronym/topic/intellij-test-module

An IntelliJ module for test files.
Merge pull request #560 from heathermiller/issue/5623

Fixes SI-5623 on SyncVar. Deprecates set & unset.

Review by @phaller.
A band-aid solution for SI-5803.

Since ae5ff662, resetAttrs duplicates trees, which doesn't preserve ApplyConstructor.
My attempt to modify TreeCopier to do so proved trickier than expected.

In any case, ApplyConstructor is not long for this world, and is only used in tree printing
to distinguish `new X` from regular Apply trees, so this should suffice pending full surgery.
Added infrastructure to enable easy enrichment of GenTraversables.
Merge pull request #562 from retronym/ticket/5803

A band-aid solution for SI-5803.
fixes resetAttrs
Merge pull request #563 from milessabin/feature/enrich-gentraversables

Added infrastructure to enable easy enrichment of GenTraversables.
Merge pull request #564 from scalamacros/topic/assertinresetattrs

fixes resetAttrs
Merge pull request #566 from lrytz/wip/t4928

Fix SI-4928
Fixes SI-5801, error messages regression. Review by @adriaanm
better feedback for SI-5044
correction bugs timer
[compile coffee]
Code cleanup and Console Application
adding readme and command
Track release branch.
Changing the concept of the gem, to avoid ruby errors, instead of definind the roles inside a pure ruby file, now this it is made inside an singleton class that delegates to the moulin rouge ability system, at this point compile don't work correctly
Compile still not working. Getting the fixture back to correct place
Merge branch 'master' of github.com:hilios/moulin_rouge
image origin calculateion bugfix, fragment process: handling no soma rois
Add IE Mobile 10.0
Fix IE Mobile 10.0 detection
Prune dev/ scripts from distribution
Exclude untracked files from the distribution
.vimrc: Show 80-column indicator, tabstop=4, lcs=tab:|, StripWhitespace on :write
.vimrc: Restore cursor to last position when opening a file
addting of handlebars.js
Adding .pptx support
Update simantools.py
added alias for arch linux packer pacman/aur wrapper
Cleaned up the code and added/changed some comments.
Minor change(was causing StackOverflowError).
Made InputAccessLib with older versions of Android. issue #12.
Fixed up click to call on contact page with responsive css
* testing git config
* test cleanup
th rendering
th-rendering
url listItemRenderer 1st draft
Add a / to foolfukka path redirection.
That'll avoid reloading a page when clicking on `No.` to highlight a post.
Completed approve product
Update src/Illuminate/Database/Eloquent/Model.php

Changed $this->id to $this->$key incase incrementing primary key column is not id
Update src/Illuminate/Database/Eloquent/Model.php

Typo on previous update
Merge pull request #17 from paulsimpson/master

Fixed issue with incrementing where primary key was not 'id'
adding hues to Record model
added 404+500 pages
changed Cheffile
Ieee80211: corrected obsolete comment
Ieee80211: convertToEtherFrame parameter morphed into encapDecap; added AccessPointWithIP

TBD finish
adding tests for getting a single module
adding tests for finding modules by position name
temp remove cakes AppModel for testing
fixing the duplicate class errors when running all tests
remove fasta ext service
Merge the ipv4 and ipv6 lir fetch and use tests under one test method.
Signed-off-by: David <db@d1b.org>
Update the test_rir_lookup test case to use values from local test data.
Also add a BaseBlockfinderTest class which CheckReverseLookup and CheckBlockFinder now inherent from.
Signed-off-by: David <db@d1b.org>
Fix an indentation error that was introduced in the last commit.
Signed-off-by: David <db@d1b.org>
Merge pull request #27 from d1b/refactor_testcase

Refactor testcase - sorry for the delay.
asynchronous albumart downloader using Queue+Thread
fix: missing import os
bugfixes for prod
Added an SGF parser, with a test to verify it.
Can now generate scores for pattern graphs with cycles. Yay!
intro page & sound
added config
Merge pull request #1 from s2k1ta98/master

added config activity
Chap 3 Finish
Exclude dev files from gitignore
Update library/ZendService/ZendServerAPI/Adapter/Adapter.php

PSR2 fix
Update library/ZendService/ZendServerAPI/Adapter/CodetracingDownloadTraceFile.php

PSR2 fix
Update library/ZendService/ZendServerAPI/Adapter/DebugRequest.php

PSR2 fix
Update library/ZendService/ZendServerAPI/Adapter/DumpParser.php

PSR2 fix
Update library/ZendService/ZendServerAPI/Adapter/EventsGroupDetails.php

PSR2 fix
Update library/ZendService/ZendServerAPI/Adapter/Issue.php

PSR2 fix
Update library/ZendService/ZendServerAPI/Adapter/IssueDetails.php

PSR2 fix
Update library/ZendService/ZendServerAPI/Adapter/IssueList.php

PSR2 fix
Update library/ZendService/ZendServerAPI/Adapter/MonitorExportIssueByEventsGroup.php

PSR2 fix
Update library/ZendService/ZendServerAPI/Adapter/RequestSummary.php

PSR2 fix
Merge pull request #40 from cbergau/master

Code formatting
Check for array parameter

Change-Id: I8a513a4b71f9598ff668cc3bcf91e3675356b950
versehentlich falschen pfad erzeugt
Implementing HWN opcode
Converting VM and Monitor to objects
no more commmand-t, long live ctrl-p
cleans up default style for has_many form
Add input[type=number] to list of styled form input fields
troubleshooting blue buttons
trying to find a good common ground
Merge pull request #1271 from jancel/blue_buttons

Blue buttons closes #1270,#1252
Removed crazy tabbing
Merge pull request #1272 from Daxter/cleanup-breadcrumb-code

Remove crazy tabbing from breadcrumb view-helper
Merge pull request #1268 from samadhiBot/patch-1

Add input[type=number] to list of styled form input fields
Merge pull request #1253 from robertjwhitney/has_many_style

cleans up default style for has_many form
Upgrade to latest rspec
Disable association and validation specs for Travis-CI
Add support for f.actions / f.action in forms. ( issue #1085 )

- add new form helpers
- add css styling (thanks @Daxter )
- add new specs / rename a few existing specs

Fixes the deprecation warnings in mentioned in issue #1085 except for when running specs.
Added back in the deprecated formtastic methods for easier transition

Thanks to @HectorMalot for most of the code from PR #1140
Update parallelizing_the_standard_algorithms_library.md

Fix typo
Add migration with more pictures and trailers
`brew upgrade` will both install and upgrade.
Add a few more Vim-friendly tmux copy bindings.
improved validation for date parsing
generator creates dropdown for enum column types
Visual iteration.
Added zen-coding settings
Win32 basedir
Add HTML5 Boilerplate normalization stylesheet
Add styles SCSS (copy of css/styles.css file). Soon we'll start to add Sass specific stuff.
Add app.scss that compiles both normalization and styles
Add compiled CSS files by Sass watcher.
Update layout to use new compiled stylesheet.
[maven-release-plugin] prepare release rest-assured-1.7.1
Update css/style.css
Update css/style.css
Fix another SQL query typo
Merge branch 'master' of ssh://github.com/RowdyHowell/picnit
Fix yet another SQL query...
Merge branch 'master' of ssh://github.com/RowdyHowell/picnit
add option to watch a directory for changes and then compile -i
remove test files
show options in readme
remove test.css
Merge pull request #1 from davetayls/master

This gives you option of watching a folder and then compiling the input file
subiendo mas
Merge branch 'gh-pages' of https://github.com/Rub21/midistritosb into gh-pages
Merge pull request #3 from jclema/gh-pages

ahora si
Merge pull request #5 from jclema/gh-pages

ahora si 2
sin una letra el boton
Merge pull request #4 from jclema/patch-5

Patch 5
fixed time... added clock and entropy to make time and random seed values repeatable input, placed reporting responsibility back in the hands of superiors (production responsibility still belongs to the assistant), need to look into protocol buffers soon
Made a quick flopy exercise to calculate streamflow capture.
Merge branch 'master' of https://github.com/jdhughes/PyClassMat
remove file from data
ack should search files it does not know
all ips
new sorb image coordinates added
cambios de ultimo momento
cambios de ultimo momento segunda parte
Updating SCM link
[maven-release-plugin] prepare release cvsclient-71-jenkins-8
Rename to match existing registry entry
Start changelog
Spiff up the package.json a bit
Dont distribute minified files
Use frosting for main library compilation
Refactor specs and addons to use global object while running tests
Add contributors and bump version in package.json
Updated documentation and modified API.

Changed the API documentation to push the changes for
the memory management API to the C layer. Changed the main API for the
module to call run() rather than simulate() as this seems a
better model.
Trying out the new consistent node-labelling.

Sample is now indexed from 1, so that we have a consistent
mapping with nodes. It's unclear whether this is easier to explain
or mapping back to 0 indexed.
changes for index.html
changes for index.html
sorting changes done
Merge branch 'master' into development
Added uniq to sorts
Fixed job to percolate from.
Added META_MERGE resources.
注销youtube的视频，防止被墙
Tidying
Added package.json with connect and mongoose deps
Attempt to prevent lava in mines.
Prune old, expired enchanters on boot.
Fail commit was fail
Now able to mostly export.
add template filters
refactor template stuff
Starting big refactoring
added some work macros
First working implementation of geocode client api
Enhance rkdb alias output
Auto-update: 19-Dec-2012 11:58:28
Auto-update: 18-Dec-2012 17:18:36
prototyping some things out
Removing removal of earliest tweet in list on page.
Some more changes this morning.
Working a bit.
Merge branch 'master' of https://joelburget@github.com/joelburget/miftiwac.git
Updated readme for BV plugin
Adding script that removes bash color codes from text.
regression by marking not properly un-hiding comboPicker
forgot to remove my debug comments
update version to 0.10.6
Updated datastream.php to fix a logic error in last commit.
Changed name of "main" controller to "logs", added HMAC helper.
Added some broken code to alter object mass.

Also some semi-broken code for applying yaw/pitch/roll to ramps/domes. Ramp rotation is operating but not producing the desired outcome. Dome rotation is working perfectly fine.
Merging pov's changes to Hector "physics."
Merge https://github.com/jonathanvoss/pavara

Conflicts:
	pavara/world.py
Dropped dynamic mass, fixed a bug with map loading.

Mass is now passed to PhysicalObjects via the constructor.  I fixed a
bug where maps without a <sky> element would not assign the default
celestials.  Feels a bit kludgy though.  (Default Sky/Horizon/Ground
colors were fixed in a prior commit, too.)
Fixes frame rate changing gravity, and I think also fixes hectors not being able to go up ramps. I think the collision shape was slipping through the ramp before the collision test occurs.
Allow changing permissions, added insert methods, etc.
Added some benign defaults
Abbreviated README
class location is incorrect, testing
Add score modal
Add pretty URLs for games
Update how modal is rendered - header optional, content wrapped in div
Position content in game modal
Make Enter score button AJAX
moving big comment at top of index to a README
Disallow empty notes.
Changed it so that plots are not needlessly regenerated as they never really change anyway
Merge branch 'new'

Conflicts:
	scripts/todos.sh
Fixed compilation issue
Further work
Minor fixes
Further work on thesis
changed DB file name; schema changes
Netty4 SSL communication now works for first request
agregado de cfd
cfd

agregado cd cfd
Fixed an issue that prevented instances created with Moobile.Component.create to receive options and name
Looks like it was doing more harm than good
Added the 'a' to the match list was a bad idea, it matched every elements who's tag name contained an 'a'
added manifest
Replaced setuptools with distutils, and improved package metadata.
resp image proposal
libraries, ion_auth, template layouts
Success: devel/p5-IO-NestedCapture v1.03
Success: devel/p5-IPC-Open3-Simple v0.04
Success: sysutils/tenshi v0.14
Success: devel/p5-Lingua-JA-Fold v0.08_1
Success: textproc/p5-Lingua-StopWords v0.09
Success: www/p5-LWP-Authen-OAuth v1.01
Success: devel/p5-Locale-libintl v1.20_2
Success: devel/p5-LockFile-Simple v0.2.7
Failure: editors/zile v2.4.9
Success: mail/t-prot v2.101
Success: misc/help2man v1.40.13
Success: textproc/pdfoutline v3.2
Failure: textproc/soothsayer v0.6.3
Initial implementation of velruse login with Twitter.
[LPKPTRB-653.follow_up_with_email_2] 1) removes the 'alert' after a comment has been added
[LPKPTRB-653.follow_up_with_email_2] 1) changes the default text displayed for a zero comment associated with wo scenario
[LPKPTRB-653.follow_up_with_email_2] 1) decreases (by a small bit) the size of the text in the live text area for creating new comments
[LPKPTRB-653.follow_up_with_email_2] 1) changes the color of the author of a comment to more closely match the default dark red of LPK's color  palette
[LPKPTRB-653.follow_up_with_email_2] 1) decreases (slightly) the size of the font used to display the comments in the comment history panel
[LPKPTRB-653.follow_up_with_email_2] 1) addresses Jessica's request to not send email to all associated users when a new comment is added; right now it only goes to the "Atlas@lpk.com" address (staging/prod) or the soliant gmail account (dev)
[LPKPTRB-653.follow_up_with_email_2] 1) updates the build number
Merge pull request #29 from LPKPTRB-653.follow_up_with_email_2 to master

* commit '8b942d3e8e1c306b5a001fa9fcb4dd81ac221b72':
  [LPKPTRB-653.follow_up_with_email_2] 1) updates the build number
  [LPKPTRB-653.follow_up_with_email_2] 1) addresses Jessica's request to not send email to all associated users when a new comment is added; right now it only goes to the "Atlas@lpk.com" address (staging/prod) or the soliant gmail account (dev)
  [LPKPTRB-653.follow_up_with_email_2] 1) decreases (slightly) the size of the font used to display the comments in the comment history panel
  [LPKPTRB-653.follow_up_with_email_2] 1) changes the color of the author of a comment to more closely match the default dark red of LPK's color  palette
  [LPKPTRB-653.follow_up_with_email_2] 1) decreases (by a small bit) the size of the text in the live text area for creating new comments
  [LPKPTRB-653.follow_up_with_email_2] 1) changes the default text displayed for a zero comment associated with wo scenario
  [LPKPTRB-653.follow_up_with_email_2] 1) removes the 'alert' after a comment has been added
Merge branch 'master' of https://versions.soliantconsulting.com/stash/scm/LPK/atlas into LPK_Production_Server
create a new row for every 3 records displayed
Update tests to not automatically optimize context when optimize flag is not set

This addresses #57.
Added more flight-time totals to status view
#JC-938 description is not a link anymore
#JC-986 Styles for post content were changed.
[dm-cache] discard bitset was being initialised as all set rather than
all clear.
Agrego app para demo LDAP
Agrego spring-ldap a demo LDAP
Range Analyzer planning
text, median income, working on checkbox constraints
merge index and stats
added font "comic sans"
move utility functions to Utils.js
added first useful widgets
We now have a start design
closes #268 server error when creating a new profile
Update lib/active_admin/reloader.rb

Rails 4 fix.
Truncate long messages sent with send_privmsg or send_notice.
Scrollbar height + side fixes
changed j/k remaps
Jam: Place finished binary in TOP
Scanner: Add version
moved projects into their own folders
Merge branch 'master' of github.com:kallivis/DataComTCP
Ajout du formulaire de Certification
Initial commit
Merge branch 'master' of github.com:kannancet/CrowdClub

Conflicts:
	.gitignore
doc file first cut
with new changes
remote
lansdon_test program created on lansdon branch. makefile updated.
Updated the README to reflect the new cat API changes.
utils: extend cum-membership

Signed-off-by: Bas Westerbaan <bas@karpenoktem.nl>
utils: fix graphs-iriss

Signed-off-by: Bas Westerbaan <bas@karpenoktem.nl>
oneshot: 2012-08-26-year-overrides

Signed-off-by: Bas Westerbaan <bas@karpenoktem.nl>
shell: Add subscr_Es and mailman

Signed-off-by: Bas Westerbaan <bas@karpenoktem.nl>
CHEF moet ook de planningslinkjes zien. Vieze hardcode.

Signed-off-by: Jille Timmermans <jille@karpenoktem.nl>
adminedit sayfasi modifiye edildi

Ayrica password ve settings sayfalari yapildi.
bug fix

sadece user id = 1 e ayarlamistim onu giris yapmis usera ayarladim.
Simdi duzgun calisiyor
bumps version and changes to cjdns-lib-0.4.7
Add Deferred function.
Contents of html from commit 7689b3b7
basics for black-box testing of examples
fixed the input for submissions
Added message describing normal waiting time to client library
Working on layout
Removed default Rails page
CSS & removal of default home page
Merge pull request #1 from R-Y/master

10/3 合わせれるように
Merge pull request #2 from R-Y/master

10/4 クラスモジュールが完成、マージ
added README.md
ArtsFormProt->Artformに変更
Merge remote-tracking branch 'nazuki/master'
Update README.md
ゴミ掃除
classファイルを無視する。
少し修正
基本システム完成
鉤縄実装中。RopeJoint使いたい。
Merge remote-tracking branch 'umemura/master'

Conflicts:
	ScrollNinja/bin/org/genshin/scrollninja/ItemManager.class
Merge remote-tracking branch 'kimura/master'

Conflicts:
	ScrollNinja/bin/org/genshin/scrollninja/Pause.class
Merge remote-tracking branch 'iwakawa/master'

Conflicts:
	ScrollNinja/bin/org/genshin/scrollninja/BackgroundManager.class
	ScrollNinja/bin/org/genshin/scrollninja/EffectManager.class
	ScrollNinja/bin/org/genshin/scrollninja/EnemyManager.class
	ScrollNinja/bin/org/genshin/scrollninja/FileOperation.class
	ScrollNinja/bin/org/genshin/scrollninja/GameMain.class
	ScrollNinja/bin/org/genshin/scrollninja/Interface.class
	ScrollNinja/bin/org/genshin/scrollninja/ItemManager.class
	ScrollNinja/bin/org/genshin/scrollninja/MainMenu.class
	ScrollNinja/bin/org/genshin/scrollninja/Pause.class
	ScrollNinja/bin/org/genshin/scrollninja/PlayerManager.class
	ScrollNinja/bin/org/genshin/scrollninja/StageObjectManager.class
	ScrollNinja/bin/org/genshin/scrollninja/StructObject.class
	ScrollNinja/bin/org/genshin/scrollninja/StructObjectManager.class
	ScrollNinja/bin/org/genshin/scrollninja/WeaponManager.class
	ScrollNinja/src/org/genshin/scrollninja/object/weapon/Kaginawa.java
a
Merge remote-tracking branch 'umemura/master'

Conflicts:
	ScrollNinja/bin/org/genshin/scrollninja/GameMain.class
	ScrollNinja/bin/org/genshin/scrollninja/ScrollNinja.class
	ScrollNinja/bin/org/genshin/scrollninja/StructObject.class
Merge remote-tracking branch 'kimura/master'

Conflicts:
	ScrollNinja/bin/org/genshin/scrollninja/GameMain.class
updated
Merge pull request #3 from Kagetsuki/master

Updates and Upstream Merge
Merge pull request #4 from Kagetsuki/master

Fix last request
Added function ip_a to readers.py
added brand new fixture list
second repo charlie added
štampa dokumenta, prikaz opisa
rnal, borba sa grafikom i formom za unos artikala...
nemam sta citati verziju, jednostavno setujem version sa vrijednosti
last_version
first commit
first commit
Jesan
Merge branch 'master' of https://github.com/kobingo/jenstest.js
Version set to 3.0.999. Means: 'hunting for bugs' before 3.1
set margins to 15px for close and p in picture-model
Fiddled with missile & jumper code, introduced create() to jumper and missiles.
turning chat on bugfix
case insensitive image injection
test from kri
Merge branch 'master' of https://github.com/krithigam/git-check

Conflicts:
	Check1.txt
bukkit 1.0.0-SNAPSHOT update
bukkit 1.2.4 update
fix doc example locals data
Added JQuery Validation Library.
Corrected issues reagarding Ormlite.
Corrected Model Class.
alta de preguntas y respuesta a las preguntas listo
resolucion de coflictos
webserver goodness
automerge

--HG--
branch : pu
Added tag 0.8.11 for changeset 20a10e3f8cd1

--HG--
branch : pu
- fix import
- bump

--HG--
branch : pu
automerge

--HG--
branch : next
automerge
Updated heightmap support in gameplay-encoder:
- Multiple nodes/meshes can now be input into a single heightmap file generation.
- Output filename is now a required parameter.
- Fixed some issues related to meshes with complex geometry, such as overhangs.
- Heightmap generation is now multi-threaded for improved speed on multi-core cpus.
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
Fixed gameplay-encoder to support FBX SDK 2013.1 and 2013.2.
Updated the pre-compiled gameplay-encoder.
Updated the encoder readme. (wininet.lib not required anymore)
Merge branch 'master' of https://github.com/blackberry/GamePlay
Merge pull request #281 from dgough/master

Fixed gameplay-encoder to work with FBX SDK 2013.2
Merge pull request #282 from blackberry/master

 Rebase from master
Merge branch 'next' of https://github.com/blackberry/GamePlay into next

Conflicts:
	bin/win32/gameplay-encoder.exe
Merge pull request #284 from sgrenier/next

Updated heightmap support
Fix intra-word emphasis (Blogger). Fixes #383.
Do not create bodies and rely on body factory instead.

  * Bodies are not explicitly created anymore.
  * When a solid component is added to a joint component, the body is
    created once with the body factory if it has not been created yet.
  * In SRDF parser, add inner and outer objects for bodies to compute
    distance computation analyses.
Set zero inertia matrix for empty dynamic bodies.
Attach capsule components to joints and handle collision and distance pairs.

  * Capsule components are attached instead of segments.
  * Capsule objects are added as outer objects for collision checking.
  * In the same time, segment components with the same parameters are
    added in the distance pairs.
  * This somewhat hackish solution is done to achieve collision-free
    path planning and compute continuous (and possibly negative)
    distances when analyzing the capsule body distance pairs.
Update test and print robot in file.
tidy up kata rating
Merge remote-tracking branch 'origin/review-model_in_progress' into review-model_in_progress
L3GD20, Triple-Axis Gyro Breakout Board
Readfile: tri and trinorms
Integrate changes to vimrc