labofsahil/github-event-dataset-2012 huggingface dataset:
Small bug in detection of class-A networks.
Merge branch 'master' of ssh://git.nic.cz/bird
Merge branch 'master' of ssh://git.nic.cz/bird
Merge branch 'master' of ssh://git.nic.cz/bird
Merge branch 'master' of ssh://git.nic.cz/bird
Allows to redefine master table.
RDNSS and DNSSL documentation for RAdv.
Documentation update,
Fixes default route in OSPF multiple area setting.
Fixes BGP subcode during global shutdown.
Some minor fixes.
NEWS and version update.
Merge branch 'master' of ssh://git.nic.cz/bird
DragonFly support add - thanks to john@marino.st
Fixes a bug with neighbor cache and overlapping IP prefixes.

When there are overlapping IP prefixes and one disappears,
neighbors associated with it was removed even if there
is another covering IP prefix.
Fixes a bug in primary IP selection.
First build with LUA linking in + SWIGed ELSA - not invoking LUA yet though.
First version with LUA dispatch actually running, yay.
(Nothing useful happening of course, but hey, it's progress..)
LSA+IF iteration through Lua seems to work now ok.
Made LUA errors fatal - they should be caught in LUA code, and not wind up in bird, after all.
cleaned SLA categories: Hardware, QoS, Security, Energy.
new constraint MaxPowerServer
Fixed missing 'O' state in moesiLogic.h and changed mesi to moesi in the Cache Controller Builder
Working on SettingsWidgetAPI
D
20121108LC
removed the custom body mass settings
Tooltips for translation progress, user authentication framework (preparation for Elgg integration), format framework (base class for format objects), manifest and version files stored as meta with each project, gp_retrieve_meta method to get meta for projects and other objects, more flexible gp_projects_dropdown, delete associated meta when deleting project, tools menu for export available to all authenticated
Initial commit.
Merge branch 'master' of github.com:forkloop/DataToggle
Updated Categories Migrataion date for db:migrate
Item11267: Convert to modern perl version string

git-svn-id: http://svn.foswiki.org/trunk/TipsContrib@15689 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
added eshell
添加中文语言支持
open with local var
fix DTI dir matrix bug in fiber tracking
VBC interface for single subject analysis
QSDR minor revison

use white matter for registration
r38826 -> 38888


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@38899 ba62deef-0ea0-e111-9166-001e4f0fb9b1
r38826 -> r38854        Update instructions (CVS has been replaced with SVN)


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@38897 ba62deef-0ea0-e111-9166-001e4f0fb9b1
- Merge the following from the English version:

	r27981 -> r39362	head/ja_JP.eucJP/books/handbook/users/chapter.sgml


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@39379 ba62deef-0ea0-e111-9166-001e4f0fb9b1
Revert "Added echo line"

This reverts commit 4791b44d7e2372e9cb61211aada207d2f5eb63c9.
Revert "Revert "Added echo line""

This reverts commit 397ea17cc28fecc6d54023f302b0494685355a59.
Revert "Revert "Revert "Revert "Revert "Added echo line"""""

This reverts commit 56096ff5e6c16d4049bd97ba0d4d67d8e0bfc5f5.
extended the "interesting" profile attributes
diabook-theme: add "population density 2010"-layer to EarthLayers-box
diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes
Merge pull request #252 from tomtom84/master

diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes
add event titles to discovered birthday events
typos
add photos to PM autocomplete, improved appearance
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:
REALLY fix fpostit this time

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

REALLY fix fpostit this time
initial
Merge branch 'master' of https://github.com/fritzvd/wms_creator
fix casting in printf
mensaje de menos de 50
Fixes some errors with NoneType as an item weight, implements multiple rows for items, possible fix for missing message window after a few days. tweaks mainWindow ui
Downgraded to copycopter client 2.0.0
fixes pause
added test cards
:question_id parametresini params olarak alamıyor
ARC additions

additions to the original ARC conversion
added DataContext
Comment change reverted (for testing purpose :-)
Comment change reverted (for testing purpose :-)
removed rdom reference -- not using that module here
accessToken async
add words
Merge remote-tracking branch 'origin/master'

Conflicts:
	Word/Word_Hans.txt
Merge remote-tracking branch 'origin/master'
Implement basic Navigation Bar using Backbone
Adds workspace for testing additions to GDICore. Updates and corrects the UIImage imageCroppedToRect method
fixed AnimationImpl to be started again by moving the currentTime to 0 when start() method is called
Started to add show records and link shows and galleries
Ported spatialite
Make sure we close readers used to setup catalog
SLD Intro - added content, reordered sections, deleted empty sections

git-svn-id: https://svn.codehaus.org/geoserver/trunk@17193 ef1d6e69-97e5-0310-af46-8a06194da32a
SLD Ref - added multiplicity of sub-elements

git-svn-id: https://svn.codehaus.org/geoserver/trunk@17194 ef1d6e69-97e5-0310-af46-8a06194da32a
provided more information in regards to what is in the repository
removing mac metadata file
add whirr repo script
add whirr repo script
add whirr repo script
Added first version of archive_files.sh
Removed warning of file names with spaces in archive_files.sh
Memory manager + buxgfixes
devel; template encoding
june report chaanges
Polish up the receipt page
* Implement client side form validation with jquery.validate
Got rid of tweet button
Fixing spec, showing your own note by default
Add codemark filters backbone model and hook it up to codemarks list
Connect the sidebar to the filter based nav
Trigger page refresh for everytime the filters change
Connect the sidebar to the filter based nav
Merge branch 'backone-analytics' into backbone-nav
One page app territory
Merge branch 'backbone-nav' of github.com:gmassanek/codemarks into backbone-nav

Conflicts:
	app/assets/coffeescripts/application.coffee
	app/assets/coffeescripts/backbone/collections/CodemarkCollection.coffee
	spec/javascripts/RouterSpec.js
Really, right this time
successful parsing of dl.bukkit
initial gyroscope class
updated mobile styles and new anlayse image folder
missed some BRs and obsoletes
added max movebook move setting
cleaned up code to be more compact and obvious
fixed alpha beta top level pruning problem
fixed bug from previous code clean up
Hide PM link if user doesn't have access
code makeup + fixes

unstoppable service, notification+location fixes
added config.xml
added config.xml
Translation of William Kolomyjec's "Hex Variations"
Sync with Debian's upstream/3.0_a27 (new log file name, persistency reworked,...)
Bump Standards-Version, raise Build-Depends from dh 8 to dh 9 + raise compat version to 9
Drop debian/patches/07_support_findiso.patch which is in upstream nowadays
Drop deprecated debian/patches/14_no_blkid_on_lenny.patch
Refresh debian/patches/ against new upstream code
Drop deprecated debian/patches/28_remove_localized_manpages.patch
Release new version 3.0~a27-1+grml.1
functional templating, object insertion and return, sorting
cleanup
thx @ james
added profile image to user, good step in adding multiple photos
forgot a file
presentation
Merge branch 'master' of github.com:gsuslol/TwitterDemo
edit note ekledim...
add methods to accept data and make string methods use data underpinnings
nginx.conf tweaks
.org checksumming, specifying tags in cmdline, bugfixes.
moving solr into production
Switching from multimethod to protocol for ring.util.request/body-string
de aplha
sbt 0.12.1

Closes #15386.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
nickle 2.72

Closes #15385.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
imlib2: require x11

imlib2 without x11 has missing symbols needed by other programs
like feh.  Add a `depends_on :x11`.  Remove the deps on libpng
and freetype. Works well with superenv.

Fixes #15325

Closes #15390.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
parmetis 4.0.2

Closes #15384.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Fix missing keg-only on pre-Mountain Lion formulae.

Closes #15375.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
libmxml: requres xcode

Closes #15311
slang: add mirror

Closes #15387
sbt: Update to the new Homepage.

Closes #15398.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Merge remote-tracking branch 'mxcl/master'

* mxcl/master:
  sbt: Update to the new Homepage.
  slang: add mirror
  libmxml: requres xcode
  Fix missing keg-only on pre-Mountain Lion formulae.
  parmetis 4.0.2
  imlib2: require x11
  nickle 2.72
  sbt 0.12.1
scamper 20111202c

Closes #15397.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
movgrab 1.1.12

- Upgrade to version 1.1.12
- Remove the four patches merged for us upstream
- Leave in the libUseful separate configure step for now.
- Works well with superenv.
- Works to dl videos as designed.

Closes #15400.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
git 1.7.12.3

Closes #15392.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
urlview 0.9.19

Closes #15395.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
fuse4x-kext: Use explicit path to cp in caveats

Directions for installing the fuse4x kernel extension rely on the `-X` option
which is only available from BSD `cp` and is absent in GNU `cp`.

Fixes #15364.
fuse4x-kext: Update to 0.9.2
fuse4x: Update to 0.9.2

Closes #14956.
fuse4x-kext: Add bottle version
jenkins 1.485
wxwidgets: A more common name for wxmac.

- Change the blacklist to hint that we include wxpython with wxwidgets.

Closes #15407.

Signed-off-by: Max Howell <mxcl@me.com>
slony: Check for postgres instead of pg_config

This is a better check for ensuring that a server is available.

Closes #15403.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
Game starts paused now
Removing bounding box.
Updated ground layer and fixed camera.
Updated spring module pom for mongodb.
Added editor.cpp example
tweaked input prompt of editor
improve gravity
collisions are actually sort of working now
Add some null pointer sanity checks to Codec stuff.
TestCase.Unit is no longer required to implement Callable, because I've come to regard that as having been a mistake.  And at once, a hundred useless "return null;" statements were silenced.
Hint to git that downloading the releases submodule is probably not necessary unless explicitly asked for.
Docs.
release version v0.6.4
commented line 168
changed CSS layout
test
Changes to orbit options
Added option to Orbit
Add option to select a custom SMT solver
Set the SMT logic to QF_ABV
Changed the call to get externalIP to be more pythonic.  Removed popen to Curl
no sending icmp when you can't send an arp
rename class generation scripts
s.109: roznica pomiedzy skladowymi q zmiennymi lokalnymi
scena manager update
Old README removed
add fop test
Added the camera for the duo skeleton fight
réactions à la lecture de la propriété de locke
adjusted tint2 config
acpi config tweaks
reordered launching of auto start programs
changed music dir in mpd config
updated shortcut labels in conkyrc
turned off cairo-compmgr in autostart
changed ctrl-e shortcut to launch thunderbird instead of subl
removed custom copy/paste code
added slime as submodule
Added dependency

Duh. Obviously need to wait for Riak to be installed before creating the certs.
remove fb send button
Bump version number in ChangeLog
Autotweet done
[WIP] [Unstable] GroupLocs refactoring
[WIP] [Unstable] GroupLocs refactoring
[WIP] fixes
[WIP] compile errors fixes
[Fixed] compile problems, 404 error custom handler
[Merge] merged with group-locs refactoring branch
[Add]  Add Tag.
Added slim framework for restful services
Merge branch 'master' of https://github.com/igateno/foiamachine
Now we can migrate to load.
Change overlay for de.
Template: correction d'orthgraphe
added sqlsrv connector.
set gon.global.courses to achieve site-wide autocomplete
replace bootstrap.js with bootstrap.min.js
add socket.io notify to conf.js
add telephone status icon
add video and online status icon
resize phone status icon
fix transpatent background of png
setup attendee list UI in conf.jsp
change online and phone status when on notify recived
Set default color param to linecolor
Updated with more files I missed in the initial svn sync.
[How it works] change the section titles
add vote, but not test
added pre tag for event detail
Fix bug with the determination of list type in the query-to-list service
add GO id resvoler to service
workspace view is maximized on app launching correctly
recolor/re-needle blue tigglete
Upstream Release 1 - June 17, 2012
----------------------------------

This is the initial release of Upstream, the ISC-USENET River uploader.
Consider this software to be of ALPHA quality.

[NEW]
* Uploads River data to usenet, creates River file
* Creates River Links, or RLinks
* River files are backwards compatible with NZBs when converted with river2nzb
* Automatically and transparently pars segments as they are uploaded
* NFO files are automatically uploaded and added to metadata
* Tracks articles and bandwidth as upload progresses
* Flexible, albeit complicated command line usage

[FIXED]
- Nothing as this is an initial release

[ADDED]
- Nothing as this is an initial release

[REMOVED]
- Nothing as this is an initial release
informe projecte
balka
Added apply config file for VPS
Added multiply blending mode
Support #29: SCM Wiki: Added some comments to the main method.
Gave up coffee
First/Initial commit
Merge branch 'master' of https://github.com/j-beckman/first_app
Added files to Arduino
compatible with thin server
compatible with thin server
Added some notes on prototypes
...
Feature: added picture for readme.
Convert BoardModel constructor to take a list of subscribers to simplify the test
Commit test...son
JSON Service With Token Auth added
adding data cache to gitignore
Create page_1.cfm
Updating version numbers.
Massive speed increases for mapping a lap to a reference lap.  Speed is now entirely dependant on sqlite... for now.
Merge remote-tracking branch 'upstream/master'
Fix issue with dpkg-maintscript-helper when building for Lucid.
Remove reference to dotbuntu since domain will never exist.
New upstream version 5.4.9
Added params to the list command for discovering the next page of links by passing paging parameters.
Fixed JSLint warnings
Add underscore as a dependency and use it and jQuery

This has fixed some IE8 errors while parsing the presence stanza
Removes the RSVP functionality when the user owns the farm they're looking at.
Merge branch 'master' of github.com:jchubber/hubveggies
Adding import scope and increasing lookahead for version parser since 3 isn't enough to distinguish pinned ranges vs. true ranges with multi-segment member versions. Also adding a couple tests that exposed the version parsing problem, and adding a jar-with-dependencies assembly to help manually test different version constructs
Use admin zones instead of address in uploads list

Translate administrative zone names on uploads list
fix incomplete uploads page link on post-save dlg
remove html code from help_text
Don't check paths if no attachments exists.
How do branches work?
fixed importScripts() (recursively) importing the worker script instead of its arguments
Merge pull request #1 from jefferyto/importScripts-fix

Fixed importScripts()
Don't symlink the DS_Store file
Add more teams to seeds.rb
RF: openssl_wrap now uses camelCase = PsychoPy style

tests still pass
modified projects into OSGI nature

Signed-off-by: jEVETools <jevetools@gmail.com>
OPEN - task 2: Default Model API Implementation - moved into internal to
avoid export
http://github.com/jevetools/jevetools/issues/issue/2
Signed-off-by: jEVETools <jevetools@gmail.com>
add blackidea
Update README to better reflect object assocs
refactor some of the modal dialog markup; add breadcrumb nav
Completed flow control implementations
Completed/amended functions implementations
added block.pages
New files for tag editing
intro two functions about scopes
allowed signout via get request
removing unwanted files and updating gitignore
add rex5demo import-export backup files
Change calculation of hist bits
Auto-update: 18-Dec-2012 17:15:06
Auto-update: 12-Dec-2012 16:37:46
Auto-update: 06-Dec-2012 10:28:51
Auto-update: 20-Dec-2012 14:59:12
changing pages/subpages resets the photobox and descriptions
all controls go to camera, worked with day/night diffuse
Isolate include failures; add scope to method call context
Implementação do EF.

ainda não está completo.
Version 2012.beta.1206
Merge branch 'master' of https://github.com/jonatanmv/backup.sh
- permit changing the config file path using the KIBANA_CONFIG
  environment variable.
Implemented ajax actions
Fixed order problem with new hook
Merge pull request #1 from Japh/master

Ajax actions implemented
Bug lines in bod and bug in create, solved
dont use socket class?
Tests for 0 precision and undefined precision.
Fixed array.remove() to splice only the one matching member
let the emacs automatically load all config under base path
add tabbar.el and config
add shell language(include shell-completion)
1. support third level folder scan 2.rename lang-shell
poudriere-devel: WIP

It's working now but build_queue and cleanup are outdated still
move edit from bin/brew to its own cmd/edit

part of 9afc85ad338f9e053fe36127937d308ad62593bc
move home from bin/brew to its own cmd/home

part of 9afc85ad338f9e053fe36127937d308ad62593bc
Add note that publishers should put the primary data in the default graph

... if they need to support both dataset and graph syntaxes.
Improved the sentence a bit.

/cc: @gkellogg

This addresses #201.
Uyhun added a random comment in game.php
Manually create the models so we can have more control over sorting
#JC-566 >< user profile bug
#JC-1209 Changed JavaDocs.
[dm-cache] maintain an immutable version of the pool_features for
reporting the table line.
cluster: change plugins kwarg to list of plugin objs

Previously the plugin kwarg was tied to the config and the actual plugin
loading would happen at runtime by Cluster. This meant that anyone using
StarCluster as a library would have to pass a list of plugin metadata
rather than just creating a list of plugin objects. This caused an
unnecessary coupling between Cluster and StarClusterConfig.

Changed the plugins kwarg to accept a list of plugin objects. The code
will also check for the previous format and if detected will raise a
deprecation warning and load using the old convention. Moved
load_plugins code to deathrow module. In a future release it should be
merged into StarClusterConfig._load_plugins and support for the old
format via Cluster should be removed.
cluster: dont catch ctl-c when running plugins
commands: clean-up ctrl-c handling for all commands

Replaced convoluted handling of ctrl-c via signals in StarCluster
commands with simple try/catch blocks for the KeyboardInterrupt
exception.
cli: enable config debug logs when using --debug
utils: add debug kwarg to get_arg_spec
config: pass DEBUG_CONFIG to utils.get_arg_spec
add support for new m3 instance types
initial commit
Merge https://github.com/jtuxin/JsProperties
Se implementa abm de penias y su vista
Add kerio's mail address to authors.txt.
Add new graphics for future.
Fix it.
Add simple activity graphs using gruff
Update dates for 2012 tournament.
Fix tabs.
Remove manual adding of UNH games. (not relevant anymore)
Remove acelog.txt (why is it here anyway?)
Minor stylistic changes.
Update starting and ending dates to fetcher.
For the moment UnNetHack is 3.6.0, update versions.
Ask ~> 1.2.6 sinatra in Gemfile. (app doesn't run with sinatra 1.3.x)
One more date update to about page.
Clean up and expand the section on cheating on the rules page.
Put all the items in cheating list in gerund.
One more gerund fix.
Put tournament starting and ending dates to its own file.

Also added when signing up starts.
Tell when signing up starts on the front page and show the button at appropriate times.
Add server side checking that users don't register at unwanted times.
Tell users to go away if registration is not open yet.
added dokumentmatcher
relink.shの更新
mostly finished omniauth.  Should merged and branged.  Started days and tasks
layed out a bit."
Have 5 day view working exept the done/not mechanism
Imported example applications from vroom project.
Updated main menu callback functions.

Main menu button and toggle button callbacks now pass the button object
to the callback function.
Updated button and motion callbacks.
Use get_resource() function to get particle texture file.
Use center function (vroom.core.transform).

The center method of the PointCloud class is currently broken. It
has been replaced here with the center() function which computes the
center point for an array of vertices.
Changed file extension to .vroom for demo programs.
Merge branch 'master' of github.com:jvan/vroom-examples
Revert "Draw tab triggers and key equivalents in menu"

Reverts 25071ce6e586fb4fa963f319f329bd4a6f3b98bc
Reverts 757219b8f1a940acc81154a69ae26771046c2430
Improve tab trigger rendering

This is using NSAttributedString’s NSTextTableBlocks:

* Font is determined from current menu rather than hardcoded
* Fixed: Invalid font size on bundle-item popup
* Fixed: Both tab triggers and key equivalents can co exists on single menu item
* No relayout calculations are needed after menu update (this is done automatically by NSLayoutManager when using NSTextTables)
* Uses 10.5 compatible API
Move help book out of English.lproj

This way localizations without a help book will fall back on the english one.
Remove old tab trigger render code

This code was using (the no longer there in the 10.7 SDK) GetPortBounds() to be able to render into a CGContextRef.

It was also using the private _NSGetCarbonMenu to be able to install the menu handler (that augmented the rendering).
Initial commit of Simplified Chinese localization for xib files.
Updated chinese translation for terminal preference panel.
Update rmate script (fix for --host=auto)
fixup! Remove old tab trigger render code
Add CSS to release notes

Presently just a symbolic link to the Help Book’s CSS.
Merge branch 'master' of https://github.com/textmate/textmate into integrate
merge
Insert path when dropping binary files

This is only when there is no drop command for the file type.
Make the file drop path relative to current file

Previously these were relative to the project directory with current file’s directory as a fallback, but 1.x used current file.
Merge branch 'master' into integrate
File browser shows context menu on ⌥F2

The key is consistent with the default key for bringing up the context menu in the text view — that key is however taken from the key bindings dictionary, so ideally we’d do the same in the file browser. Need to factor out the key bindings parsing code first though, and in theory the key bindings dictionary allow for multi-stroke bindings.

This implements issue #18.
Add phoney target for deploying

The nightly builds still require me to manually run the ‘TextMate/deploy’ target, so if we can make it 9 characters shorter, it’s totally worth it! :)
Test all versions of clang for “new enough”
Checkin release notes
When $builddir is relative path, pass absolute path to fixtures makefile.
Merge branch 'master' of https://github.com/textmate/textmate into integrate

Conflicts:
	Applications/TextMate/resources/ReleaseNotes.md
new googleVis R Markdown file
Use Ember-Bootstrap's RadioButtonGroup
modify 1.4., 2.1., 4. andw 5.
ISUPPORT data is no longer overwritten every time the bot connects to a
new server.
Outgoing messages without a destination no longer trigger an exception
the dangers of writing css while drinking
Unset CanUserAddRows.
add wikipedia icon to wikipedia link entries
Fixed factory related bug, virtual method bug, etxt bugs
rc
整理した
various scripts
clean up some INCBINs near  script commands
some weird movement data for swimmers?
some ruins text
minor texts and minor scripts
battle tower texts
remove 599 bytes bytes from the end of bank $E
remove $cde bytes from the end of bank $15
remove $8ee bytes from the end of bank $16
remove $f67 bytes from the end of bank $17
remove $d72 bytes from the end of bank $18
remove $599 bytes from the end of bank $1A
remove $95c bytes from the end of bank $1B
remove $913 bytes from the end of bank $1c
remove $d7e bytes from the end of bank $1d
remove $958 bytes from the end of bank $1e
remove $9d8 bytes from the end of bank $1f
remove $408 bytes from the end of bank $26
remove $44e bytes from the end of bank $27
remove $a6 bytes from the end of bank $2b
choices usables en js
Quicklinks color fix
Signed-off-by: KatzSmile <katzsmile@lead-games.com>
Change color of place2book button.
Trying to increase the 'usability' factor. Broke a few things. The
dialog doesn't work anymore.
Windows are BACK!
added test audio clips
remove superfluous charset attribute
minor edits to initial document
Added getImage Function
Fixed mistakes addressed by professor.

Missing self-closing tags, li elements not nested properly, and missing
id's within a couple labels.
test fichier test
various updates and revisions
some more. is there a bug in substitution?
* Changed score attribute to accurately reflect the API.
* Aliased score? method to scored?
* Added test for score attribute.
Clean up Rules file

The formatting of the Rules files had gotten a bit messed up by my early fumbling attempts to work on it. Fixed the indentation and removed a commented-out rule that won't be used.
replace "isFree" with "return"
Heroku
Remove Heroku
Update for worker
プレイヤーとメインメニューの更新
Merge remote-tracking branch 'kimura/master'

Conflicts:
	ScrollNinja/bin/org/genshin/scrollninja/GameMain.class
	ScrollNinja/src/org/genshin/scrollninja/GameMain.java
プレイヤー更新
Merge remote-tracking branch 'kimura/master'

Conflicts:
	ScrollNinja/bin/org/genshin/scrollninja/Background.class
	ScrollNinja/bin/org/genshin/scrollninja/Stage.class
	ScrollNinja/src/org/genshin/scrollninja/Background.java
gamescreen,stage
Added form to layout
move rules from constructor to function param
rename commit_number_with_rule to number
Added day sim framework.
Merge pull request #20 from douglasszeto/master

day sim framework.
Merge branch 'master' of github.com:Lucky13xi/BounceAngle
Merge pull request #21 from kkruusi/master

Please add this to the master it has more buildings
Merge branch 'master' of github.com:Lucky13xi/BounceAngle
omg
Merge branch 'release/0.2.10' into develop
Make manager commands more configurable
Update
Merge branch 'release/0.2.11'
renaming
removing SamplePropertyName
update_rec_server... vrati stanje semafora na on
epdv, append tarifa korigovan, generacija avansnih faktura provjera stanja partnera
format
[ci skip]
fakt, tekuća vrijednost za rok plaćanja stavljena u funkciju
fakt, konvertovanje odt u pdf, korekcije
Create easy guide for development.
Fix some typos

* quotes
* add two missing "be"s
[evcoap] proxy += Publish (still missing DELETE handler)
Adjusted settings.py to let Heroku handle code injection, now that settings.py is where Heroku expects it. Still need to fiddle with Debug and paths though.
Trying to get CORS to serve JSON.
Fix date comparison again...
Use Frontend.hs only through Action.hs
Express that Action.hs is the interface to Frontend*
Hide Session and handlerToIO
Hide HighScore.hs behind Action
Hide Save.hs behind Action
Add position to a few forgotten error messages
Hide the IO portion of Config behind Action

Now all IO is encapsulated in the Action monad and hidden in Action/.
Split off a part of Action.hs that does not know the monad internals
fix zoom config error
radio stations support
foo
Mege branch 'new_branch_name'

Conflicts:
	THANKS
	app/views/layouts/application.html.erb
	db/schema.rb
Added toggle flagging
Added generateField() function which is to be implemented for restarting games
index json
add json result
add json result
Use Markdown for README
Add outline for a decent README
Update static content show page
show histogram.
fix email
Fix bug
#83: Improve the release procedure
Solving #100 ...
Update pom.xml

not needed for a momment
removidos plugins não empregados
shadow ok
shadow ok
Remove desert map.
update by yanqw
Removed poorly defined filter in recipes controller
CANT FALL BACK ON UPDATING
Add method for checking if rate limit has been exceeded, just for .org domains at the moment.
Initial commit
Improved error trapping
Finished transfering the timesheet to a seperate object.
Add Django Mobile.
Add jQuery Mobile.
Add mobile template version.
Add Backbone.js
Apply MVC.
Rename file.
Split view from model.
Add mobile version actions.
Fixes UI events.
Change view.
Add toggle class.
Fix sort on date changed.
Fix open new link target event.
[FillStyle] Parse Bitmaps for MORPHFILLSTYLE
Adding raid function
Use :formats instead of file extension

Using file extensions in template paths is deprecated, so use the :formats parameter instead.
add ha97.com and cssrain.cn
protect against missing constants
check tagger before allocating object
return NULL
use done_testing
manually declare constants
Topic without pnum
Topic page
Support try containing multiple statements, and add tests

The body of a try statement should be an implicit do, returning
the value of the last executed statement. Previously the compiler
was only expecting (and allowing) one body statement for a try.
Port with-redefs-fn and with-redefs, with tests
no more bounce, xml, edits
Work on search page.
Initial testTransport module skeleton compiling
Codec Tests working for all supported value types
Unity tests working
Fixed memory leaks in Unit tests
Removing old gitignore
Added a Bootstrap Modal wrapper with some variants like Modal, InfoDialog, ConfirmDialog, etc.
Roi ram qua, ignore xong lai add vo...
Bugfixpatch, for details see the commit
Remove libnativehelper
decrease size of new document text
simply show title, 'Litewrite' only for empty documents
fix linear crf transition
support overwrite old page functionality
Initial commit
Merge branch 'master' of https://github.com/lois47/nuitinfo2012

Conflicts:
	.gitignore
Revert "up and running with ruby 1.9.3 and the latest dependencies"

This reverts commit 77ea98494461b7846287b7a9ee03577d4d26c62e.
- rename QuickDialog target
- add QuickDialog framework
- update precompiled header
- update framework setting
- add title label for QSegmentedElement
accidently a word in the setup
Versió v0.4
- Afegits formularis de pressió i glucosa
- Afegits formularis d'històric de mesures
- Localstorage funcionant.
Using $OUPUT for icon rendering
start auto-attack
Add access to stream, to make it  manageble
添加了可后台灵活配置。。。。
service call works now more error tolerant: exceptions within service calls lead to error printing, but just continue query processing with an empty result as result of the service call instead of stopping query evaluation...
[metadata.rb] bump version to 0.4.1
Change default output to match standards.
first version of SADAS source
delete ngram-keywords.rb file
custom package name
Merge pull request #8 from machida/master

add training
fixed training design
modified training design
fixed experience layout
added label
designed flow page and icons
fixed eyecatch
Add CorporateIntroduction.HJP
Add FlowDetails
ChangePhotos.HJP
added privacy and rules
fixed layout and added some pages
ChangeDescription_training
added images
Change route.rb
Change routes
fixed route
remove favicon_link_tag
Merge pull request #9 from communiture/favicon

remove favicon_link_tag
Remove favicon
Change views.transactions filtering to allow filtering on Total
Fixed the import statements with relative paths, and changed the doc quotes.
added a sign up form
completed user sign up
removing a few defuns
reserve etc
Merge branch 'master' of https://github.com/mandumeans/Database
failed attempt to implement variable-dependent BCs
ie: total pressure BC where velocity depends on internal pressure
system assembly function is too complicated and needs re-writing
Testing Singleton
DijkstraPath correct implementation, along with changes to Graph interface and ConnectionGraph class
re-enable fastcgi signal handling

closes #4093
add tags
Merge branch 'bug-4093'
entity attributes OK
Entity attributes are validated
Structural DSL generating code.
Updated the Docs link to the new version
Added examples
Admin all
Merge branch 'master' of github.com:marcgg/thegoodslife
new style for spaceships
Fix LDAP email attibute.
fix: new commands with names of built-in methods caused the stex mode to crash
Replace e.preventDefault() with e_preventDefault(e)
MDL-31901 file_info_stored now provides access to the wrapped stored_file's get_imageinfo() method
MDL-31901 repositories serving images from the filepool now provide preview details
MDL-31901 fixed the name of user draft file serving handler

Files stored in user context, draft are must be served by draftfile.php,
not the pluginfile.php.
MDL-31901 draftfile.php supports the preview parameter
MDL-31901 draft files manager supports realthumbnail, realicon and dimensions for images
Adjust position of SmartRuleCreatorDIalog by cursor coordinage
Added example, reworked styles
Inherited project configuration from entangle-parent
Renamed github site server name to 'github'
Corrected scm url and removed now unnecessary github site plugin config
Added wiki and javadoc links
Speech should still work when the braille device is disconnected. (dm)


git-svn-id: file:///svnroot/brltty/trunk@6583 939f125e-6a04-4c72-91c6-d7bd2746daa4
Put back api_claimDriver() and api_releaseDriver() but call them in a better way. (dm)


git-svn-id: file:///svnroot/brltty/trunk@6584 939f125e-6a04-4c72-91c6-d7bd2746daa4
Add more laptop keyboard key table bindings. (dm)


git-svn-id: file:///svnroot/brltty/trunk@6585 939f125e-6a04-4c72-91c6-d7bd2746daa4
Make the HumanWare driver autodetectable when using USB. (ml)


git-svn-id: file:///svnroot/brltty/trunk@6586 939f125e-6a04-4c72-91c6-d7bd2746daa4
setScreenMessage)( should to text->Unicode conversion. (dm)


git-svn-id: file:///svnroot/brltty/trunk@6587 939f125e-6a04-4c72-91c6-d7bd2746daa4
Several already-translated French messages were left disabled. (jpm)


git-svn-id: file:///svnroot/brltty/trunk@6588 939f125e-6a04-4c72-91c6-d7bd2746daa4
Don't include the functions which convert between BRLTTY and BrlAPI commands if API is disabled. (google)


git-svn-id: file:///svnroot/brltty/trunk@6589 939f125e-6a04-4c72-91c6-d7bd2746daa4
Use the Android log (rather than syslog) on Android. (google,dm)


git-svn-id: file:///svnroot/brltty/trunk@6590 939f125e-6a04-4c72-91c6-d7bd2746daa4
In log.c, test for all special operating systems before testing for syslog. (dm)


git-svn-id: file:///svnroot/brltty/trunk@6591 939f125e-6a04-4c72-91c6-d7bd2746daa4
xbrlapi needs to support the new sticky modifier commands. (st)


git-svn-id: file:///svnroot/brltty/trunk@6592 939f125e-6a04-4c72-91c6-d7bd2746daa4
#new_file_form: updated piggydb.widget.FileForm to be able to save the uploaded file via the 'Register' button
remove unnecessary RIL if possible
Implemented attachment update for image cropping.
Loading default cropping dialog after upload.
Clipping - wrongly, but clipping.
Fixed avatar cropping.
Cropping for employee images.
Fixed jCrop styles.
Pdf generation for 2012.05.14-Entrega-Documentacion-Sprint.4-5
Fix: Javascript where sending float for x and y parameters on cropping images
Increment version number in order to avoid javascript cache errors
Merge pull request #2 from andresmoschini/avatar-cropping

Avatar cropping fix
Restoring delete server data script into solution.
Merge pull request #74 from andresmoschini/increment-version-number

Increment version number in order to avoid javascript cache errors
Merge pull request #73 from matias78/pdf-generation-of-documentation-end-sprint-4

Pdf generation for 2012.05.14-Entrega-Documentacion-Sprint.4-5
Merge pull request #72 from AlphaGit/avatar-cropping

Avatar cropping
reverting back to git gem for jruby support
start list of potential projects
added get + and - functions
Add config for Travis CI PR testing

Setup instructions here
http://about.travis-ci.org/docs/user/getting-started/
Add Travis build status image to README
reorganize/rename option-parsing files, plus some minor cleanup
more Node.js code/shims
Merge pull request #248 from nschonni/travis-ci-pr-testing

Add Travis CI config and status image
Fix #253
Merge https://github.com/ryu2/jsdoc
fix shims for process.stderr.write() and process.stdout.write()
improve parsing of --query parameter

The argument parser now converts the query string to an object, and it
casts booleans and numbers in the query string to the correct
JavaScript types.
Merge pull request #254 from ryu2/master

include the method signature in the heading for each method
Merge branch 'master' into override
make it possible to set env.opts.destination in a config file (#252)
don't overwrite pages like 'index.html' if a namespace has a name like 'index' (#244)

also, improved the default template's efficiency--we now create lists
of all classes/members/etc. just once, instead of once per longname
DRY out error constructors, plus a couple of small fixes

- error messages won't end with '\nundefined' if meta.comment is missing
- better prototypal inheritance
Merge remote-tracking branch 'origin/master' into show-defined-tags

Conflicts:
	rhino_modules/jsdoc/opts/args.js
MOSYNC-EXT: Better command line handling
MOSYNC-EXT: Constset support
added octave case in Mozart::Component. might break scale logic, but that's for another commit
hmm. lost my spec fix, due to weak git-fu.
Definindo arquivo README e .gitignore
Breadcrumbs fix + Proper List View =>Show/Edit views navigation
LA-3: The demo app runs in jetty during integration-test phase
cirumventing error in test, problem with compiling helper in test
computers infos improved:
- added hostname for external IP number
- log moved to GUI to make sure that is always executed
ui change
merge work to home
checks to see if latest mentioner is not a friend and if so always responds if mentioned by them
this is my first commit
another source
commit second.py
Update dfp.gpt.logger.override.js

fixed 'gpt-queue_start' regex to be more general; wasn't triggering any events.
changed event loop from for-in to standard for(;;) loop; was causing problems in IE<9.
Drastically reduced statusline complexity
Optimize favourite implementation
Add should vbe redirected to my_guest page.
Update src/dispatcher/RegexFormatter.java

Fixed merge conflicts
Proper logging setup
Handouts
Pagination, user partial
Added admin field to users
Ignore compilation artifacts
No ruby
Merge remote-tracking branch 'upstream/development' into development
Merge branch 'development' into IDI-15-content
Merge remote-tracking branch 'upstream/development' into development
Merge branch 'development' into IDI-15-content
Merge remote-tracking branch 'upstream/development' into IDI-15-content
IDI-15: Update Sheridan's institution name and link
IDI-15: Updates to people and bios from UT
Merge remote-tracking branch 'upstream/development' into IDI-15-content

Conflicts:
	sidebar-about-nav.php
IDI-15: The rest of the bios from UT
Merge remote-tracking branch 'michelled/IDI-46' into development
Merge remote-tracking branch 'acheetham/IDI-15-content' into development

* acheetham/IDI-15-content:
  IDI-15: The rest of the bios from UT
  IDI-15: Updates to people and bios from UT
  IDI-15: Update Sheridan's institution name and link
Merge remote-tracking branch 'upstream/development' into IDI-15-content
IDI-15: Adding info to mobile cluster page
Merge remote-tracking branch 'acheetham/IDI-15-content' into development

* acheetham/IDI-15-content:
  IDI-15: Adding info to mobile cluster page
IDI-46: Removing the borders from the hc themes. Removing the outline focus styling.
Merge branch 'development' into IDI-46
specs cordova instalation
Add more tests
Update README
Cambio3
File1.txt
File2.txt
File3.txt
New File4.txt
Cambio4:
File2.txt
New File5.txt
updated build and remove a console log
Start working on the watch API, not fully functional yet
Fix config.yml.sample.
fixing bootstrap coffeescript dependency
logger
pcap: ctypes-based libpcap bindings
add more tests to poisson
update gemspec
optimize #probability_range for poisson
only one newline at the end of the files
add more tests to geometric
Forgot to push css and js folders
fix: do not render the background if the window start to small.
removed searchable plugin
update to grails 2.0.3
Restructuring and -factoring.

Trying to make controller thinner. Breaking things more apart.

Handling URLs in a better way.
Add Pager to artists index view.
Detect empty query results in controller and view.
Merge pull request #24 from mokasin/unstable_model

Refactoring Controller & Model
Merge remote-tracking branch 'upstream/master'

* upstream/master: (68 commits)
  Fix for test broken during prior commit rebase.
  26: Separate service location from dependency injection
  Update .gitattributes for .resx to merge=union
  Remove MediaTypeFormatterCollection.Find() methods. They were not being used and they did not take into account whether a formatters supported a particular type.
  Issue #12 Add CreateResponse<T>() overloads that accept formatter and media type parameters.
  Performance improvement on validate. Cache expensive parts of the modelbinding context across requests, specifically validation nodes. Also need to ensure the cached nodes get propagated down to usage point when we clone a context.
  Mark quota exceptions as Handled for Json
  Setting /nr:false for build.cmd, will stop MSBUILD.exe from sticking around after builds are finished.
  Fix race condition in TaskHelpersExtensions.Catch
  349089: Fixing the issue where HttpMethodConstraint does not work for WebAPI on Web Host
  Update DNOA packages in Microsoft.Web.WebPages.OAuth project to released version.
  perf: improve TaskHelpers.Iterate. There's a huge perf penalty for switch threads on completed tasks.
  [cleanup] remove empty folder from project no functional changes.
  Added support for dealing with wildcard matching in accept headers by updating the comparison mechanism by which we compare two media types. The comparison now includes wild-cards as part of it matching algorithm (both "*/*" and "text/*".
  Fix additional collection-related APIs to consume/return consistent types
  Bug 333326: HttpControllerDispatcher should not set the controllerName on HttpControllerDescriptor based on controller route value
  DevDiv 388456 -- WebHost should not use Transfer-Encoding chunked when content length is known
  DevDiv bug 388519 --[Monitoring]  HttpActionBindingTracer was not created, and tracing did not show the roll-up of model binding results.
  Minor code clean up in cookie related classes.
  Updated BufferedMediaTypeFormatter to follow the pattern defined by MediaTypeFormatterTestBase with respect to when to close the inner stream, how to handle 0 size content-length, and other constraints. At the same time allowed the common "using" pattern for reading and writing streams so that a sample formatter written on top of BufferedMediaTypeFormatter simply can do this:
  ...
BandSet TableView presented modally from IASKViewController 'button'
4.3.2 fixed
Started on toysql lexer.
odwrócenie sortowania
split controllers, typos fixed
order tab system
and... changing the db back to 8 - dashboard is metrics data *not* kitten data
start tracking instances in a "farm" set and also which are active
  (i.e. moz-state = ready) or inactive.  This allows kittenherder
  to know what instances to monitor and also how to handle them.
Automated configuration bump: update verify configs for 11.0 build 2
Ordenando arraylist de bombs antes de chamar update()
Setando fixed fullscreen and landscape
added a fog machine. clouds now slowly crawl over the game area
manual merge of last commit
Merge branch 'master' of https://github.com/mperes/ZombieAttack
Upgrade gatein-parent
getCurrentViews(Class<T>)
added score report functionality
add elastic search to chef
merge from master
finished whitebox test of KDTree
Merge branch 'develop' of github.com:msta/Projektklyngen into develop
Commons-digester depnendency resolved
fix #16917: add to selection is rather invert selection - add to selection now add elements only if they are not already present in selection to avoid the inversion
testing Prakash commit rights
Added docs site
Remove version numbers from Gemfile
Update Gemfile with new and replaced gems
Add coffeescript guard, remove less guard
Add sass guard
Add style.scss
Remove old style.css and less
Fix sass output in Guardfile
Fix some leftover less bugs in style.scss
Add _reset.scss
Add .sass-cache to .gitignore
+ style.css
Change livereload guard to watch for css instead of less
Change doc.less to doc.scss
cpufreq: Make sure the cpufreq notifier is called last

The cpufreq pm notifier also sets the cpu to 800MHz (imposed by the
hardware) to suspend the device. Make sure it is called last when the
system is going to suspend, so the cpu doesn't need to spend too many
cycles at 800MHz unnecessarily.

Thanks to arighi for the original commit.
refactoring - cleaned code, introduced separate files.
add all (for test)
Added backoffice app
Added usage of django-seacucumber to send emails queued in django-mailer and using django-celery tasks
Removed non-ARC code
Bug 801579 - Fixed GCC warnings (accessible/src/msaa part) r=trev.saunders
Bug 801589 - Avoid redefining ERROR in ErrorList.h when wingdi.h is also included r=ehsan
Bug 793329 - If the trusted UI is closed on device, fire an onerror callback in mozPay indicating as such; r=fabrice
Bug 812886: Watch network (tear)down events and kill PeerConnections r=ekr,smaug,bsmith
Bug 799419: Force NSS startup during PeerConnection Initialize r=bsmith,jesup
Fix for bug 768050 (Make TypedArray::Create take a wrapper cache and create JS objects in the compartment of the cache's wrapper). r=bz.

--HG--
extra : rebase_source : 3ec03b33913e14a113bf9283566a68fe3be5fe02
Fix for bug 768533 (Make mozilla::dom::Uint8ClampedArray::Create call JS_NewUint8ClampedArray). r=bz.

--HG--
extra : rebase_source : baaf7494f64a91a9315a6e1bed3f75239f8eab81
Fix for bug 768669 (Move remaining DOM list proxy bindings from behind the pref). r=bz.

--HG--
extra : rebase_source : 738cd6df3aa353b682f931beaabde74de8c1a2bd
Bug 812344 - Don't use a qualified enum in CSSParserImpl::ParseDeclaration; r=roc
Bug 769291 - Move nsOfflineCacheDevice::Discard() to cache IO thread. r=honzab

Discard() is called from destructor of nsApplicationCache.  Instances
of nsApplicationCache is released by last reference, it can be in main
thread.  We move Discard() tasks to cache IO thread to avoid blocking
the main thread.
Bug 757960 - GCC 4.6.3 build warnings in nsNavHistoryResult.cpp for unsigned >= 0 (or < 0) always returning the same value [-Wtype-limits] r=mak
Bug 770418 - Improve identity logging output. r=dolske,jparsons

--HG--
extra : rebase_source : 4bfe055e1b783ffa80ad9b8515168a68e02f6a90
Bug 753239 - Implement a DOM component for navigator.id. r=jst

--HG--
extra : rebase_source : 4cd2b33f46c6c884dc9a3ff4820203275a6c5ae9
Bug 753239 - Identity module mochitests using DOM APIs. r=dolske

--HG--
extra : rebase_source : 10858321be5fe3a59059cf1e8472507a4140c666
Bug 776250 - Rename nsISVGChildFrame::UpdateBounds to nsISVGChildFrame::ReflowSVG to make it easier for non-SVG devs to understand the SVG code. r=roc.

--HG--
extra : rebase_source : 9c2d8f3d76dab1a842d6cc5607a13a49703061d6
Bug 773595 - Have nsSVGPatternFrame::GetPatternMatrix use the correct attribute. r=longsonr.

--HG--
extra : rebase_source : b261c4e5cda1971ea6877790d97d056e05361373
Reftest for bug 773595 - Have nsSVGPatternFrame::GetPatternMatrix use the correct attribute. r=jwatt.

--HG--
extra : rebase_source : 212070c3be82c498dd2037ed091fb3d32f766475
Bug 776306: When prepending to a display list, only update its 'mTop' pointer if it was empty. r=roc
Bug 761278.  Remove the non-standard uploadprogress event on XMLHttpRequest.  r=sicking
Bug 775317.  Add a test for the JSOPTION_VAROBJFIX behavior of JS_EvaluateScript.  r=jorendorff
Bug 779445 - SegFault in WorkerMemoryReporter because it accesses mWorkerPrivate when null; r=bent a=gavin