labofsahil/github-event-dataset-2012 huggingface dataset:
Skip IPv6 addresses whose interface is set as IFDISABLED.

FreeBSD 9.0 with default setting (ipv6_activate_all_interfaces
is not YES) sets IFDISABLED to interfaces which don't have
global IPv6 address.
Link-local IPv6 addresses on those interfaces don't work.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35610 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
skip addresses whose interface is set as POINTOPOINT.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35611 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
fix the path of ifconfig.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35612 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Fails test that callback recieves factory and scope name as arguments
Passes test that callback recieves factory and scope name as arguments
Added fb share (and .social-icon-* icons)
Initial setup and node modules
Added icon-time to pickup and delivery datetime column
Fixed use of incorrect names.

This is one of the reasons I prefix all non-public fields with _.
Archetype project Maven revamp.

It occurred to me that I could simplify things by using Maven profiles, and
after some investigation and rearrangement, I'm very pleased with the results.

First, the old way to do things compared with the new:

  1. Build and run your Java backend:

  Old: mvn test -Ptest-java
  New: mvn test

  2. Build the HTML version of your game and serve it up on localhost:8080

  Old: mvn package
       mvn test -Ptest-html

  New: mvn integration-test -Phtml

  (Same goes for Flash with s/html/flash/h.)

  3. Build and deploy the Android version of your game to a phone:

  Old: mvn install
       mvn -f android/pom.xml android:deploy

  New: mvn install -Pandroid

  4. Build and IKVM the iOS version of your game:

  Old: mvn package -pl core,ios
  New: mvn package -Pios

This new arrangement also allows us to generate the Flash module without
worrying that it's going to cause a bunch of trouble for people who don't end
up using it, because unless you specify -Pflash, Maven will totally ignore it.

It also allows new users to avoid coming face to face with annoying Android
configuration issues until such time as they choose to run with -Pandroid.

And shockingly, it does not seem to confuse Eclipse. Eclipse still imports all
of the submodules. In theory we might even be able to get Eclipse to be smart
about using these profiles and using them to more easily, for example, build
and test the HTML backend from inside Eclipse. (I have not yet tested with IDEA
or Netbeans.)

It's full of win.
We need to get back on the OpenGL thread to deliver our response.

Threads are so much fun!
Please welcome Underscore.js and Backbone.js to core. fixes #21664.


git-svn-id: https://core.svn.wordpress.org/trunk@21591 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Compress scripts/styles: 3.5-beta2-22269.

git-svn-id: https://core.svn.wordpress.org/trunk@22269 1a063a9b-81f0-0310-95a4-ce76da25c4cd
On setup-config step 2, default to focusing on the textarea and selecting its contents. fixes #21656.



git-svn-id: https://core.svn.wordpress.org/trunk@21873 1a063a9b-81f0-0310-95a4-ce76da25c4cd
add the api's to the iPayPal folder
documenting the crazyness of the stats class
wip - tidying up use of excluded col list (stats)

doesn't build because it's so horribly intertwined with the
evil table counter code
wip - stripped out much of the evil mid-export calculation of implied

doesn't build yet
wip - removed table counting from diagram output

to be replaced with precalculated data that's easier to follow
moved getExcludedColumns to right place
turned of features to get a build to work again

pass around implied constraints as needed.
it's better to have this crippled than in the state it was in, impossible
to change anything due to spaghettiness. urgh.
fixed ALTER -> CREATE conversion

oversight when refactoring
comment tidy up
fixed error writing to mysql - :schema error

schema name was not being set when reading existing db pre-apply
cleaned up duplicate variable passing that was a factor in the bug
cleaned up schema/user switching code & refactored to method
stub mysql proc def property
Handle SSL errors when notifying Prowl.

Added a try-catch block to handle occasional Prowl SSL problems without
failing the post-processing script.
Attempting to fix Synology index when creating folders
Attempting to fix Synology index when creating folders
Added option for Synology to remove files from index
Added file remove option from the Synology index
Actually import the SSLError
Updated simplejson to latest version
Added support for tract notification: framework, interface, testTrakt
Improved Trakt integration: settings are stored, notifications to tract are sent on downloaded episode
Bugfix: episode name was in different format then expected, fixed by using split on string
Added icon + description for trakt
Changed author of trakt.py file
Changed split for ep_name to only allow 2 splits (so 3 parts)
Fix for potential issues with ep_name parameter. Search happens on location now.
Changed from notify_download to update_library and also method to collect data to send to trakt (now using ep_obj)
Removed option from interface, only using USE_TRAKT now.
Fixed logging mistake on successful method call
Improved logging
Use custom 401/404 page instead of showing traceback.
Update sickbeard/metadata/wdtv.py
Created templates directory, made index.html, and linked to it in settings.py
updated copyright date
made API prefer to accept a Collection of Number objects for the axis data
adjusted version
bye bye
converted examples to use Collection<Number> rather than double[]
delete
added entry
switched to .md format
getSchedule has been added, initial commit
Documentation and updates for Themer
mertinatull
Added clean Web.config, extended readme.
Fixed markdown for AppSettings configuration section.
Enabled NuGet package restore.
Implemented VK (Vkontakte) client.
Updated example web app and readme.
Cleaned up documentation.
Fixed wrong usage of .Received().
Renamed Client to OAuth2Client.
Renamed ClientTests to OAuth2ClientTests.
Started implementation of OAuth (version 1) client.
Fixed compilation errors.
Added GetSection method to IConfigurationManager.
Extracted base class for AppConfig. Implemented LibConfig based on dedicated configuration section.
Implemented dedicated configuration section handler.
Finalized rough implementation of OAuth (version 1) client.
Reordered methods.
Simplified IClient interface (only 2 methods were left).
Inherited OAuthClient from IClient.
Implemented Twitter client.
Implemented RequestFactory, changed OAuth2Client to comply new signature of IClient. Ignored some obsolete tests (these ones should be refactored/deleted).
Logout and Add Lesson button update. AJAX -> Handlebars for Teacher Home Page to display the lessons by that teacher.
MORE IMAGES, MORE IMAGES!!!
TinyMCE
Styles, user signup and code cleanup
Styles, user signup and code cleanup
put back gpg key adding
Change the font to Menlo to allow bold and italics
Fix bug in terminal that truncated column numbers.
Change insert mode background color
Map <leader><Space> to insert a space character
<C-R><Shift>P will tell you the group name of char
Add plugin for highlighting hex colors in files
enable XLS parsing in web controller
notes about date conversion
Athletics

Tweaked Basketball
Core implementation was updated
Fixed ICMR2012 camera-ready (added General Terms).
First draft of the Abstract.
Missing Headers
add uip_app_registration
Added controller tracing interceptor
Initial commit of files, including scons build files
Slight speed improvement for square attacked function
Basic evaluation, taken from scheme by Tomasz Michniewski
Timing code for perfts, test code for evaluation function
get point neighbours
WaxSim with Xcode4.5
Sceleton chapter 11 - ajax.
Defined ajax.create function with funtion 'setter' at load time.
Test for required url parameter get function.
passing recording length
fix force_encoding use without checking if it is available
tidy up README.md
updated README
minor improvements in Gspot.lua and main.lua
Copy cisco emulator files to remote client
Copy cisco emulator files to remote client
database example finished

TODO: document a lot!
illustrations
almost down documenting examples
All examples are now documented
GIT source code added
Added "set zerovolt" to cmd list
Added "set offset" command for Wfc
Set default WHT port to none
Added get_control_act() to get actuation signal
Do not reset() the mirror during influence calib

Do not set the mirror back to 'flat' (or whatever reset() does) in
between calculating the influence of each actuator: use the shape of the
mirror as set *before* calibrating the influence matrix.

If reset() gives a bad mirror shape, than we need to add some offset
before we can calculate a proper influence matrix. Setting the mirror
back with reset() would negate this offset every time.
Do not reset() the mirror for zero calibration

The zero calibration should be independent of the wavefront corrector
shape, so we do no reset() it as it might have some interesting shape.
Added documentation to the code for previous commits
Merge branch 'release/0.1.0'
Version bump in readme.
Merge branch 'master' into develop
1. complete function of top-book;2.add async loading image;3. add todo list
Remove previous files.
Use same root bg as terminal bg.
set default font; remove custom jshint flymake fn
fixed the :W command...
renamed lac2013.png to lac2013qr.png

so we have a name for the real LAC2013 logo
renamed lac2013klein.png to lac2013small.png

britannia rulez the wavez!
medium sized image
recompiled style.css
vim: vimwiki tweaks
vim: update bundles
refactoring to Actors - initial V
random data generator added
some smart comment
adding channels to synchronize the db writes etc .
Added Light Filters, removed terrain
more code
more fixes to signals
modification on index page
news and events page
modify structure
fix merge
Upload function - Uploads to imgur

This implements the upload function, which uploads an image object to imgur,
using the api_key given:

myimg.upload(api_key)
Changes: Guest user can only see the idea. cannot perform any action. Logged in user cannot vote his/her idea. Indentation in comment list and votes list hamls.
Merge branch 'master' of ssh://github.com/vikas-reddy/IDya
brazilian language encode fixed
brazilian language encode fixed
kick1
数据库
Merge branch 'master' of https://github.com/vincent78/vtools
Created Player class.

The player object stores a number starting from 1 to the number of players
in the game. This value indiciates whose turn it currently is. Each player
also has a selected position that is stored, in order to make it more
convenient for inputting commands.

A unit is able to be identified to a specific player.

The player's turn is advanced as needed, e.g. after moving, reproducing,
or enhancing a unit, but not after selecting a unit.
Create CLI using ANTLR.

Wrote grammar file for creating commands to interact with board using
ANTLRWorks.

Currently support commands are:
SELECT UNIT @(x, y)
MOVE UNIT [@(x0, y0)] -> (x, y)
BOOST UNIT [@(x0, y0)] (AGILITY | DEFENSE)
REPRODUCE UNIT [@(x0, y0)] -> (x, y)

These commands create an instance of select, move, boost, and reproduce
commands respectively, which are later executed.
defaulted additional tabs on projects to false
Funcionalidad de resolucion
Borro archivos y agrego estilo a css
Borro archivos y agrego estilo a default.css
Agego estilos a la pagina principal, hiOne, hiTwo.. etc
Agego sombras y rotacion de elementos
Modifico colores de links en los headers
Modifico colores de hoja de estilo de <a> y sombras
Modifico estilo de nav y de tag span
Code Quality. Removed some unused code (‘left-overs’ from Joomla 1.5) in JDocumentHTML->getBuffer()
pg for heroku
exclude *.swp files
修正渲染引擎
added feedback to rake task
Merge pull request #3 from walmartlabs/develop

Blammo logo
Merge pull request #5 from walmartlabs/develop

0.0.3
Preloading stuff and maybe some fixes. Can't remember really.
Merge pull request #1411 from walzer/gles20

update doxygen config for v2.0.3
Merge pull request #1412 from walzer/gles20

update javascript/bindings/generated/ submodule revision pointer
improve BSD detection
Merge branch 'release/1.13.0'
force 0 status on rvm-installer, update #878
downgrade bash requirement to 3.2.25, closes #928
fix command grep, update #921
beginrescueend -> rvm.io
Merge pull request #930 from seabre/master

Changed rvm.beginrescueend.com to rvm.io in manpage - Thanks @seabre
patches for latest 1.9.3 release (patch level 194)
even more RVM alternatives
Merge branch 'master' of github.com:wayneeseguin/rvm
updated patches for 1.9.3-head
updated 1.9.3-p125 patches
clarified patch policy
don't reinstall libyaml over and over again on OS X
improve rvm gemset globalcache handling
Merge pull request #934 from skaes/avoid-needless-libyaml-reinstalls

don't reinstall libyaml over and over again on OS X
Corrected GSP (Grammar, Spelling, Punctuation) errors.
Merge pull request #937 from ParkinT/master

Corrected Grammar and Spelling mistakes in help
try to better detect rbx compilation failure, update #935
improved solaris detection
Merge branch 'master' of github.com:wayneeseguin/rvm
add rvm gemset export Gemfile, closes #982
Rm `unset rvm_configure_env` for libyaml.

mpapis asked me to remove this because it was
unsetting CFLAGS & LDFLAGS, which I set in my
~/.rvmrc. This is for installing Ruby with new
Xcode without installing Command Line Tools.
Merge pull request #1218 from mattdipasquale/master

Rm `unset rvm_configure_env` for libyaml.
if last purchase not found, take last purchase rate from item
完善供应商模型
产品详细信息，图片信息
Merge branch 'master' of https://github.com/weelion/ufc_init
任务模块,代理商api调整
added logging to signup
added logging to signup
fixed page reference
1. add random select in R index and C index;
2. fix the bug in forward R loc and backward R loc;
move Message to Notification
add tabs to layout
forward Erfurt
add more log output and hubs
Implement first prototype of dead-code-elimination
Fix collection of usage
Fix dead-code-elimination by taking care of safe function
Improve the optmizations
Takes care of safe functions
rake jobs:work_once
everything is centered now
more libc linker fixes and might have finally fixed the errno problems
mostly links except for nptl
deleted swp file
deleted tmp folder
moving aside current nptl folder
rebuilding nptl folder
finally links but with many warnings
Corrected case problem on the 'inertiacomputed' topic
connect, disconnect : can pass a function
Merge branch 'develop' of https://sylvainL@github.com/winktoolkit/wink.git into develop
move edit position to the end of the line
add study blue notes
Accepted a conflicted PR
Merge branch 'master' of https://github.com/githubtrainer/poems

Conflicts:
	tolkien.txt
switch between interactive/scripting
pep8 some long lines
Fix preview loading.
Modifieid test in Section 5 and Section 6
section 5.6
Merge branch 'master' of https://github.com/wtchoi/262report

Conflicts:
	CS262A.tex
replaced OfflinePlayer with MyWolfPlayer
updating gem file references
L2MModel now has an events property (an instance of events.js, surprisingly) which dispatches events to the view. The view now initialises once the model is sitting pretty.

Offline.xml added for offline dev on the bus.

Tweaking require.php so it can be wired up to the view.
midi
merge
Changes for advantising project (video ads, feeds importers)
working on making parameter group available in searchGroups during fit ...
working on making parameter group available in searchGroups during fit ...
Fix for issue #35: undefined material in md2 file

The parser crashed when there was not material defined in the md2 file.
Now it reports a RajLog message but continues without throwing an
exception.
Fix for issue #24. Removed the unnecessary texture slot limit

The texture limit as defined in GL_MAX_TEXTURE_IMAGE_UNITS was
wrongfully limiting the total number of textures as used in the whole
app instead of per fragment shader. This limit is now being checked in
AMaterial instead of TextureManager.
Max3DSParser bug fix
Removed support for xbps<0.16.
Added JunOScript references to README.
leveldb 2012-12-5
Actually uploaded it.
cv

Signed-off-by: y2gu2xi <y2gu2xi@gmail.com>
initial
check_format() works.  lots of other reorg and cleanup
CHANGED:merged the code base(inside of foxhole package) from
github/feathers;
CHANGED:implement the ChessGasket with toolTip functions;
CHANGED:binding the global configurations at ChessPiece's constructor;
将pyapns改为APNSNotification
bug fixes in parser
bug fix in scrollbar considered inline
cleaned meta and removed nativeElement class duplicate
added serialization of style in inner html
Added to navbar. Added addRecipes and corresponding servlet
fixed sum direct links
Merge pull request #100 from akshay9/master

Urgent Pull request
set up master.py to run visualizations
I messed up the sim_data

added sim_data ignore to .git_ignore
add pscheck.sh
In the check_user_data function, removed the part which set the error variable and then only exited in the END section.  Reverted it back to normal, where it will just exit at the first line it finds.  It's not possible to output all the hashes correctly from that function if I only wait until the END section to exit
split ToJSON from Throw::HTTP
data pass-throw
one seed = =
fix control-key
add direct observation ui controller
put line break after error message to improve exception message readability
TFJ-630 contributor API support
added:
ResponseList<User> getContributors(screenName/userId)
ResponseList<User> getContributees(screenName/userId)
StatusUpdate#setContributingTo(long)
white space, add-to-list auto-mode-alist
create slave in center
srtsock rewrite
Main menu button : change the title
Update og/blue-red
baseline added to idea
ignore pickled models
Fixed tests to support configured broker host and port.
Version 0.85

更新2.02版的规则
datas no editar
Signed-off-by: zhoufeng <mircle12345@163.com>
2012/08/06/IRC
2012/08/06/Twitter
[maven-release-plugin] prepare release hw2-team14-0.0.11
SRM 540 DIV2 500 and SRM 540 DIV1 250
Merge branch 'master' of github.com:zsxwing/Topcoder
Repository slackware:
        ColorFolder
        apache-ant
        fltk
        openjdk
        QMPlay2
        smpeg
        eiskaltdcpp
        texmaker
Fix memory overflow in am_replace_str()
update for highlighting
updated spec file to remove spanish and portuguese and oreka file
add hubot deploy scripts
Grundläggande design
Přidáno druhé cviko
Merge branch 'master' of github.com:3DprintFIT/BI-3DT
Stringify app names before displaying them
added databases and cgi_bin folders
Changement de prise en charge des collections de données ( ajout d'une classe à cette intention )
Changes to Activiti Modeler component
Update src/org/openstreetmap/josm/plugins/graphview/core/data/EmptyTagGroup.java
Added a new way to check versions
Also test albacoremodel now
fixed testcase
add license info
Merge pull request #199 from wenshao/master

add license info
o MapBox/TileStream changes (closes #42)
o Set the contentScaleFactor for the TiledLayerView in didMoveToWindow instead of setNeedsDisplay
o boundingMask not limiting pinch-zooming (issue #43)
Merge branch 'develop' into snapshot
no main moc in the pro-file
Merge branch 'zhujun' of git@github.com:App-coder/xmaicrm.git into zhangjun
Merge branch 'zhujun' of git@github.com:App-coder/xmaicrm.git into zhangjun
Merge branch 'zhujun' of git@github.com:App-coder/xmaicrm.git into zhangjun
Signed-off-by: mxzjzj <mxzjzj@gmail.com>
Signed-off-by: Toney <458820281@qq.com>
Merge branch 'zhangjun' of git@github.com:App-coder/xmaicrm.git into zhujun
Correct number of arguments added
Merge pull request #75 from nlake44/nginx_config

nginx config files written incorrectly in full proxy deployment
google analytics code
update games
Use gravatar for shortcut icon
Add articles
add tmx screen sharing script
Added the archbranch script
[MOD] XQuery, Request Module, renamings:
      get-attribute() -> attribute()
      set-attribute() -> update-attribute()
some mvc added
Revert "add CodeMirror as the input field"

This reverts commit 1e62b99657a07e419f7a6609a80e3b301e831daf.
Flos Kommentar gelöscht
Merge branch 'master' of https://github.com/Berserker88/duelp.git

Conflicts:
	src/main.java
Merge branch 'master' of https://github.com/Berserker88/duelp.git

Conflicts:
	src/main.java
Revert "Revert "add new doc""

This reverts commit 59385d4a591b3d1b92ff0f9965a375bc6f9babea.
YouPaaS

YouPaaS
Show current powerups in status bar
WIP more levels added
Improved doc comments
Improved doc comment
Made tableName() protected
Improved text
Added licensing/copyright information
Removed namespace imports and added more comments
Prepare installation package
Add phpunit/phpunit requirement in dev
Fix bug in autoload for test when using vendor/bin/phpunit
small fix
Merge branch 'master' of github.com:Buzdygan/ai-arena
Merge https://github.com/CSPshala/BeatWars

Conflicts:
	Phat Beats/CLevelManager.cpp
	Phat Beats/Phat Beats.vcxproj.filters
	Phat Beats/resource/beatlist/Levels.txt
Updating Build Script for version
test if simplenot_vim exist
added tableview specs
Correctly encoding the layer
removed possible refresh tiles action from carto_wizard, #995 take care of this
Binding functions generating HTML have access to the content of the tag they will replace.  This can be used to pass more structured arguments, such as code.
Version 0.6.5.
implement exp-feature
paramétrage jpa + paramétrage base de test + création utilisateurEM + lib nécessaires + ajout em aux actions s'identifier et s'inscrire + refactoring des actions pour utiliser méthode estVide de StringUtils
A few small fixes to the updater script.
Removed requiring callback on disconnect
SSMprotocol2: fix check for integrated Cruise Control in startDCreading(...)
Added toplevel spawner.
Convert aterm graphs to python asts
better error message for conda install if package is already activated
Adds a note for where people are.

Commits #31

Signed-off-by: CorriePie <corriekay.pinkie@outlook.com>
Fixes spiders targetting.

Signed-off-by: CorriePie <corriekay.pinkie@outlook.com>
Fixed some gallery image loading issues
Extended image expiration
Updated to latest ImagesLoaded plugin
Better blockUI default style
Fixed various image uploader style glitches
Aritrary name changes. I like this one more
Aritrary name changes. I like this one more

Signed-off-by: D1plo1d <d1plo1d@d1plo1d.com>
add translate function to branchWebsiteUrl and serviceDeclarationUrl link text
Fixed bug for shows that air by date
Added cli_linux, instructions should work better now
Prevent user from clicking button to main page in minimalistic layout
Add an ASCII Art Playa logo on startup - Since ASCII art is awesome
Resharper refactoring.
Color highlighting for the piechart.
added localization to the ConsoleInterface descriptions and options
fix #225 docpad skeleton blocks instead of ending
Merge pull request #325 from Delapouite/dev

added localization to the ConsoleInterface descriptions and options and fix for #225
Fixed --port CLI option not working (among possibly others)
v6.8.1. Improvement. Bugfix.

- v6.8.1 October 19, 2012
	- Fixed `--port` CLI option not working (and possibly others)
	- Fixed `docpad skeleton` blocking instead of ending
		- Closes [#225](https://github.com/bevry/docpad/issues/225) thanks to
[Bruno Héridet](https://github.com/Delapouite)
	- Improved localisation
		- Thanks to [Bruno Héridet](https://github.com/Delapouite) for [pull
request #325](https://github.com/bevry/docpad/pull/325)
v6.8.2. Improvement.

- v6.8.2 October 19, 2012
	- Updated the document meta data extraction regex
		- It will now treat data that is wrapped in anything that repeats 3
or more times, as meta data allowing you to use whatever is appropriate
for the markup you are currently in (before we only supported `---` and
`###`)
jyraphe -> 42.meup.org

Signed-off-by: Deleterios <deleterios@gmail.com>
--
--
--
Merged: christoph's branch
Revert "--"

This reverts commit 8d6d8f13ce39e603e093aebf576b43504ac8a16f.
Revert "Tester"

This reverts commit 09270154f431754c0ab74f28fa23dea13bbe41ff.
Fix: status not updated after reopen
Fix: missing linked objects
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
Fix: Some fix in volume calculation
Fix: Error when url is too long
Updated Internal Database
ajouts des champs  manquant a la creation d'event et au parsing
[ticket/11103] Display all unread notifications by default

Add unread count to the page title

PHPBB3-11103
Use official mimetype for Atom feed
Configuration was not read correctly
Temporarily disable language support
Remove unnecessary dependency on tx_div
Accueil Bouton
Merge branch 'Alexis' of github.com:EdouardF/kiveukoi into Ronan

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/MainActivity.apk
	bin/classes.dex
	bin/classes/com/kiveukoi/Identification$UserLoginTask.class
	bin/classes/com/kiveukoi/Identification.class
	bin/classes/com/kiveukoi/MainActivity.class
	bin/classes/com/kiveukoi/R$layout.class
	bin/classes/com/kiveukoi/R$menu.class
	bin/classes/com/kiveukoi/R$string.class
	bin/classes/com/kiveukoi/R$style.class
	bin/resources.ap_
	gen/com/kiveukoi/R.java
	res/values/strings.xml
Merge branch 'Alexis' of github.com:EdouardF/kiveukoi into Ronan

Conflicts:
	bin/MainActivity.apk
	bin/classes.dex
	bin/classes/com/kiveukoi/Identification$1.class
	bin/classes/com/kiveukoi/Identification$UserLoginTask.class
	bin/classes/com/kiveukoi/Identification.class
	bin/classes/com/kiveukoi/MainActivity.class
	bin/classes/com/kiveukoi/R$id.class
	bin/classes/com/kiveukoi/R$layout.class
	bin/classes/com/kiveukoi/R$menu.class
	bin/classes/com/kiveukoi/R$string.class
	bin/classes/com/kiveukoi/R$style.class
	bin/resources.ap_
	gen/com/kiveukoi/R.java
	res/values/strings.xml
PB
Accueil
Accueil
Merge branch 'Edouard' of github.com:EdouardF/kiveukoi into Ronan

Conflicts:
	bin/classes.dex
	bin/classes/com/kiveukoi/MainActivity.class
	bin/classes/com/kiveukoi/R$id.class
	bin/classes/com/kiveukoi/R$layout.class
	bin/classes/com/kiveukoi/R$menu.class
	bin/classes/com/kiveukoi/R$string.class
	bin/classes/com/kiveukoi/R$style.class
	bin/resources.ap_
	gen/com/kiveukoi/R.java
	src/com/kiveukoi/MainActivity.java
Accueil
Merge branch 'master' of github.com:EdouardF/kiveukoi into Ronan

Conflicts:
	bin/classes.dex
	bin/classes/com/kiveukoi/MainActivity.class
	bin/resources.ap_
Code
b
Pull branch Ronan
Merge branch 'Ronan' of github.com:EdouardF/kiveukoi into Alexis

Conflicts:
	bin/MainActivity.apk
	bin/classes.dex
	bin/classes/com/kiveukoi/Accueil.class
	bin/classes/com/kiveukoi/AjoutModif.class
	bin/classes/com/kiveukoi/Identification$1.class
	bin/classes/com/kiveukoi/Identification$UserLoginTask.class
	bin/classes/com/kiveukoi/Identification.class
	bin/classes/com/kiveukoi/MainActivity.class
	bin/classes/com/kiveukoi/R$id.class
	bin/classes/com/kiveukoi/R$layout.class
	bin/classes/com/kiveukoi/R$menu.class
	bin/classes/com/kiveukoi/R$string.class
	bin/classes/com/kiveukoi/R$style.class
	bin/resources.ap_
	gen/com/kiveukoi/R.java
datePicker dans PopUp
Corrección de nombres de diagramas.
Eliminado documento Iteración 3.docx.
Agregado documento final: Iteración 3.
added note about hard-coded XMPP config
Site updated at 2012-08-08 14:21:53 UTC
Bugfiks: Brukte gammel url til bildet
Improve theme support
Add, but do not use, Molokai theme
added vlc to the ob menu
pep8
Merge branch 'develop' of https://github.com/FATac/fatac.theme into develop
readme updates for end-of-fellowship
Refactor the reference resolving tests. Re-use existing test code.
Resolve compiler warnings.
Handle parsing error at a more central place.
Simplify code.
Use proper EMF library code to decide if a property is set.
Run modelupdates during incremental parser tests.
Try to make injection thorough of OppositeEnd finders more consistent.
Enable reference resolving within editor sessions.
Cleanup and fix handling of multi value properties.
Try to fix hudson failure.
First step of sharing a syntax by multiple editors.
Depend on interfaces instead of concrete classes.
Refactor SyntaxProvder towards a better interface.
Rewire the editor initalization.

Goal is to make sure we properly register the syntaxes in the
SyntaxRegistry before starting an editor and to then use the
same syntax within the editors.

These changes implement the first half. However, the model updaters do
not seem to be firering as expected, yet.
Merge branch 'master' into modelupdatersonly

Conflicts:
	DSLEngineering/com.sap.furcas.runtime.referenceresolving/src/com/sap/furcas/runtime/referenceresolving/SyntaxRegistry.java
chrome ext windows bugfix
added fhc2 videos
updated party sponsor verbage
Heading elipse fix
Styles TreeView
Added more solvers, and some more to simulator-problems
Merge branch 'master' of https://github.com/FelixAkk/synthbio
Finished updating untill simulator unit tests.
Merge remote-tracking branch 'origin/master'
Dropdown menus.. CSS needs to be adjusted and some weird bug with variables that change
renderer containing the true implementation (but with errors)
Add a test for the save action on the circuit servlet.
Merge branch 'master' of github.com:FelixAkk/synthbio
Merge branch 'master' of github.com:FelixAkk/synthbio into GUI_Models

Conflicts:
	program/js/renderer.js
fixes
some fixes
and debug remove
Adding OS and location string
Fixed the booboo where if on dev it works, on live it won't initialize canvas
some changes in cadr
stuff
More UTF-8 tests now pass, many are still broken due to (possibly buggy) QTextCodec which is used for UTF-8 conversion.
Testinterval mit mehr Konsolenausgaben
fix scale and alphablend
mera fix, oklart
remove some colonifications
Merge branch 'master' of github.com:HenriWahl/dhcpy6d
Correct First Realease
Update README.md

Napisane readme
Updated mps-info with gender and a few summaries; udpated data importer
Added missing jquery 1.8 lib
Fixed issues with mps json file
Added PIL installation to deployment script, and applied some install cleanups
fix bug with websocket authentication
updated docs for beta1 release
更改navigationbar

别的没有
553: First pass at making the five-star rating widget keyboard accessible. Needs testing on myItems page
553: Adding aria-live to 'saved' message so screen readers will read it when it appears
553: Add some instructions to the screen-reader text for the rating widget.
553: Adding Infusion and the FSS css files to the toolbar-view-item page so that ratings widget can be keyboard accessible. Add aria-live to status message field.
Merge pull request #132 from acheetham/553-rating-master

553 rating widget
COMP: some ITK4 changes when compiling with 64bit ids

ENH: added double support to unaryimageoperator

ENH: added an option to pxpca to select the output image format
this is actually the playerlistener
Merge branch 'master' of github.com:Iaccidentally/ECM
added context.xml.example for the console bungle
Added Data Validation for settings and WebServer settings
Fix Media Queries
Unfinished feed system
bottompad
Add HighScore
完成学生姓名、成绩录入
updated demo v2
refactorizada ubicación de archivos
modificado gitignore
Getting rid of that error about a failed copy by making the src/ -> bin/ binary copying build script more intelligent
move up to clojure-1.4.0-beta5
added fonts folder, deleted tree prefabs
First addition to parser
Bug 808724 - Move the keyboard iframe above the application iframe and use the new property to ignore transparent background while resolving clicks
[Bug 802908] [Settings] Update help links and add button to submit feedback to Mozilla
[Bug 814183] User Guide link doesn't load support page
Bug 804544 - [Clock] Alarm should respect time zone and time change r=timdream
Bug 813033 - Delete calendar accounts - cancel

Appears this just needed a preventDefault.
Bug 806052 - Upon bootup, once we swipe left to Everything.me, we should be able to swipe back right to the homescreen while it is loading [r=vingtetun]
Bug 814345 [Browser] What does a brother have to do to get a low framerate load indicator?
Bug810095_Delete_Icon_Update
Bug 802383: dynamically build the list of available locales
typo
fix linter errors (STK)
typo in icc.js (STK)
Bug 814076 - disable prompt aniamtion when unlock and vice versa
Bug 813490 - FB Import needs to support edit mode [r=jmcanterafonseca]
Bug 813925 - Add missing plural cases to all apps. r=kaze a=vingtetun
Merge pull request #6549 from stasm/813925-plurals

Bug 813925 - Add missing plural cases to all apps. r=kaze a=vingtetun
Bug 813898: use 'top up' and 'top-up' appropriately. r=kaze a=vingtetun
Bug 814339 - [Gaia][SMS][DIALER][BB] Update building block from shared with latest UX specs [edit_mode.css]
Merge pull request #6546 from stasm/813898-top-up

Bug 813898: use 'top up' and 'top-up' appropriately. r=kaze a=vingtetun
Bug 812983: Security & Privacy should be Privacy & Security. r=kaze a=vingtetun
Site updated at 2012-04-03 01:46:08 UTC
add getExcludes to Authors
testing Thread in Web site OK
Windows: fix incorrect behavior.

The drain of two more bytes than expected generated corrupt frames.
modify of some comment
Fix SchedulerService ctor
remote ssl
created Palette
Merge branch 'master' of https://github.com/LupusUmbrae/Lunar
bisschen formatiert
Adding todo on adding standardised generators for sat_genhorn_cs.

Also improvements to todo on adding prime implicates generators and
linking both to the investigation todos.
Linking to investigations on the hardness of satisfiable tree-clause-sets and pigeon-hole formulas.
Editorial corrections.

Corrections:
   1) Superfluous whitespace.
   2) "it's" - > "its".
added ice floes to ra
map clear radar color for interior to black
added UPNP support; known issue: changing the port number won't work, requires port set to 1234 (in-game) and restart, otherwise time-out
jar update.
Modif One
blabla
Merge branch 'master' of github.com:ManuDa/Training-1
saving coefficients as itk::Image< itk::Vector<float, shlevel> >
WIP: moved all files open source

This does not compile major rewrite seems necessary
WIP: fixed provisioning file

will compile, but not start
Added missing plugins

Also some code cleanup. Compiles and works now, although some functionality might be impaired. Could be due to still some plugins missing from the CMakeLists.txt
Changed dependencies to be added to right target
Merge branch 'bug-11542-move-mitkDiffusion-open-source'
Tutorial updated
Fixed wrong label
Merge branch 'bug-11053-reorganize-documentation-folder'
added image to store sh coefficients
Merge branch 'bug-11538-SaveShCoefficients'
Merge branch 'bug-11095-TutorialDocumentation'
Use explicit class declarations instead of includes to avoid cyclic inclusion errors
restructuring of test class: moved tests to separated methods
Added missing class descriptor
Merge branch 'bug-11467-QtFreeRenderer-cmake-fix'

Conflicts:
	Applications/Tests/QtFreeRender/CMakeLists.txt
Replaced node name with call of GetWidgetPlane
Moved general manual to org.mitk.gui.qt.ext
Merge branch 'bug-11001-move-general-manual-to-ext-plugin'
added some documentation to method PrintSelf
maxtime removed, doesnt seem to have an influence on shortest_path_tree
added: remove vertices from shortest_path_tree calculation, if they are not reachable in an acceptable amount of time, desc time for retro_paths added
[win32] - project files for visual studio 2010
Optimize autorejoin
Добавлено приложение построения отчётов.
Добавлено приложение построения отчётов.
deleted many files
moved many files
strona www, tabelki, plan lekcji
開発ブランチに修正をマージ

Merge branches 'namespace', 'sprite' and 'string' into 2.0

Conflicts:
	graphic/text.cpp
入力が完了したかどうかを表すイベント
シーン切り替え命令を実装
基底イベントクラスなど
Merge branches 'input' and 'transit' into title

Conflicts:
	graphic/graphic.vcxproj.filters
	graphic/scrmanip.cpp
	graphic/scrmanip.h
	graphic/text.cpp
	graphic/window.cpp
	graphic/window.h
Scene transit関数に登録
- fixed colors
- fixed pistons
itemview del

del desc
Merge pull request #1 from Mirza23/Branch1.1

itemview del
Text wrapper / SFML text
example input file & reports added
Close port after doing tests
Add cover to rebar.config

Room for improvement!
first implementation
file renaming
added width option w/ default value of 390
optionnal width attribute more compatible
solve multiple instanciation problem
updated README
improved on the debug logging that jbillo added to the importer class
added physical disc searches to importer
Modified importer to allow for pre-existing tracks to have their metadata updated.
Added support for ASIN and Author metadata tags. Added import for sqlalchemy.exc.OperationalError to importer.
Added support for the remaining EasyID3 metadata tags
Added support for playcounts and ratings to the importer
Importing now works!
* Added a foreign key from Album to Artist
* Disc number is a string, expressed as <track>/<total_tracks>
* Track objects need to be added to the database when they are being created
* Changed the way that discs are added to albums
* Limited some id3 frames from being processed, as they cause problems - need a better solution for this later.
Fix Maven repositories
Merge pull request #16 from Arkel/master

Fix Maven Repositories
Check-In dialog ready
show only current habitations
added prepayment usecase to user manual
Merge branch 'dev' of github.com:Nagian/Roomanizer into dev
Added getStatusByName() to RoomManager
Room status will be changed now on every day-end closing
fixed viewing graph for a single patient
app screenshots
bugfix
formatting
Add prepare script
Move stuff around to unclutter the root of the repo
Make that a *real* Portage overlay, fix static buildscript for the move,
and update docs
update for .help
Added partial header and footer
Updated: Use early continues instead of nested ifs
Remove vnodevclocks, no longer used.
add dcontroller
rm tmp
Initial scripts for GE Flight quest
Merge remote-tracking branch 'origin/master'

Conflicts:
	flight_quest/io/convert_data.py
	flight_quest/io/parse_METAR.py
Initial scripts for GE Flight quest
-Fix: mingw can be compiled with SDL, if you like to
inicializando repositorio con archivos
removed unneeded code from the code
Add Debug.TraceUtils.Dont
new rules are displayed
clean up of rule display/toggle

fixes bug where new rules and just voted down rules would keep a full group of active rules from being displayed
hide add rules from non logged in users

ill change this to asking them to login

Signed-off-by: Dan Kruse <kruse.dan@gmail.com>
change crystallo speed
only call user() once in deletePost
added basic json for users
default to 1 day
initial work for customizable content buttons
style fix for set of single buttons
rejigger how buttons are conditioned
Add documentation for sd_buttons
make sure folder gets scanned too
add indexed decorator
綜合: 加入270*60banner機制.
/home: 完善圖片輪播機制.
綜合: 為論壇與網站加入GA程式碼.
/hardware: 切版, 與後端製程.
/hardware: 流水新聞切換機制.
調整live update cron暫時性網址
綜合: 調整分頁按鈕, 新增ga追蹤碼
綜合: 新增星盟按鈕風格, 並調整多項版型.
綜合: 美術調整.
/lives: 加入廣告.
綜合: 微調整通用樣式.
/lives: 添加更新時間.
HRU綜合版型調整.
為錯誤頁面添加美術.
綜合: 新增helper.js, 新增一函式, 提供將contenteditable的dom轉成key-value的object.
綜合: 修改組件配色.
綜合: 修正css錯誤.
/admin: 切版.
/admin/home: 置頂焦點二則新聞後台完工.
core: 為routes建立一套邏輯, 用來取代URI中的dash符號, 以底線替代, 方便進行控制器中的函式調用.
update redis 0.7.2 to 0.8.1
Timely push
new file:   db/migrate/20121114152628_add_company_id_to_bills.rb
	modified:   db/schema.rb
Merge branch 'master' of github.com:RasoTeam/platform
Merge branch 'master' of github.com:RasoTeam/platform

Conflicts:
	db/schema.rb
Implement level restart functionality.

Fixes #20
Longer ramp in level 1.
Partial of level 2 included.
Merge branch 'master' of git@github.com:RavensKrag/WireFu.git into levels
Merge remote-tracking branch 'origin/levels'
Trying to get friend add working, no luck so far.
Ajout de common/config
Added test
Merge branch 'stm' of github.com:RhobanProject/Edu into stm

Conflicts:
	sdk/python/stm/stm.py
added active class for main navigation menu
Обновил дамп пустой базы до 2.5
refs #4 - Commit main progress.
correctly send the signal
commit at 2012-04-25 12:48
more work on improving 32/64 bit interoperability (work for #594)
Fixed #593: Warn if logging is disabled at compile time but requested at runtime
Backported the cleanup target from 0.7-dev.
Makes sure that a dirty working copy of 0.7-dev won't affect
current releases of 0.6.
Added support for "pre-signed" URLs for the S3 client.
Bumps the default version for EC2 and ELB.
Changes the bureaucratic bits.
Removed unused variable.
Changed all tabs for double space.
Add trainer classes.
Disasm FarCopyBytes and FarCopyBytesDouble.
Merge branch 'master' into vwf
[2541] Improve script for Jeklik - Zul'Gurub

Notes:
Bat riders require additional research in therms of summoning and movement
Spell 23969 requires core support
[2542] Add more defines to Icecrown Citadel and make use of the area triggers

Signed-off-by: Xfurry <xfurry@scriptdev2.com>
[2543] Implement support for Lady Deathwhisper intro dialogue

Signed-off-by: Xfurry <xfurry@scriptdev2.com>
[2544] Improve script for Marli - Zul'Gurub

Also fixed the aggro of the Gurubashi Bat Riders and added proper respawn support for the Spider Eggs and the Gong of Bethekk

Note:
Spell 24083 requires core targeting support
Script for npc 15041 was removed because it was wrong
[2545] Remove workaround for Marrowgar's ColdFlame spell - currently handled in core
[2546] More documentation!

* Add Git guides from forum to docs section
* Convert to nice shiny html output

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[2547] Remove some taxi scripts - will be handled by database

Signed-off-by: Xfurry <xfurry@scriptdev2.com>
Merge branch 'master' of https://github.com/scriptdev2/scriptdev2

Conflicts:
	scripts/northrend/dragonblight.cpp
	scripts/northrend/icecrown_citadel/icecrown_citadel/boss_lord_marrowgar.cpp
	scripts/northrend/icecrown_citadel/icecrown_citadel/icecrown_citadel.h
	scripts/northrend/icecrown_citadel/icecrown_citadel/instance_icecrown_citadel.cpp
[sd2_mr0420] remove git_id code (move to mangos, awaiting rework)
Merge branch 'master' of git://github.com/mangosR2/scriptdev2
Major config system rewrite.

* Added option to start the server from "server"
* Added code to import the database dump file in saucedb.
* Added a flag (--clear-db) to clear the database.
* Added code to set up the required log directories.
* Changed Sauce-config structure.
* Changed common/config loader to require file name as well.
* Changed init command to --config.
* Changed test reporter to 'spec'.
* Fixed ioutil to not crash when logging undefined values.
* Fixed channel command registering to not crash on error.
* Fixed argument order on the timezone calls.
* Fixed News to display the right message when setting message number.
* Fixed News to display the right message when there's no news.
* Fixed various problems with the Steam module.
* Fixed some comment formatting.

Signed-off-by: Ravn T-M <ravn.tm@gmail.com>
examples: merge: added debug information from data blob along with index
examples: merge: added bytes written/removed statistics
tests: make tests reproducable by using seed
starter code, fixed.
Sample for a client accessing the web service
[#2689] Disable plugin list and track container while loading media, enable it once loaded. Also fixed it so tooltips with no name do not get registered under undefined.
[#2060] review fixes.
Site updated at 2012-12-10 04:58:27 UTC
SUBMODULE UPDATE: Facebook
Skukojivanie menyuhi minikarti ^^.
Version change to 0.2.0.

Signed-off-by: mk124 <mk124a@gmail.com>
To cancel the use of some of the clone().

Signed-off-by: mk124 <mk124a@gmail.com>
The KeyState renamed to PlayerKeyState and modify the package name.

Signed-off-by: mk124 <mk124a@gmail.com>
Small missing.

Signed-off-by: mk124 <mk124a@gmail.com>
We might not always have a shipping address
Without these I will struggle to find the memberservice again.
styling updates
Merge branch 'master' of github.com:SlexAxton/rhokgho
svg size updating
Merge branch 'master' of github.com:SlexAxton/rhokgho
Added Log In-Window
added position information to chunks
Enable digging
moved lighting from chunk to map to allow spreading between chunk borders
added example server.js with inline docs
Merge remote-tracking branch 'upstream/master'
SONAR-3618 cosmetic improvements of role manamagent pages
Add HTML IDs for integration tests
SONAR-3895 define properties to include/exclude plugins of dry runs
added info feature
fixed bug; made genCode configurable
added beautify option to cli
added options to grunt task
version++
Made Message an interface and added a bit of javadoc to Message

Signed-off-by: zml2008 <zach@zachsthings.com>
Chunks are no longer loaded so that observers can be added.  Instead a queue is used so that they can be added once the chunk is loaded.  This prevents all chunks from being loaded at once
More player updates
Provide a source when setting health
Signed-off-by: Windwaker <wjcrouse@aim.com>
Merge pull request #164 from W1ndwaker/master

Provide a source when setting health
F Descriptors now read everything only once

Hopefully it will improve the performance a little bit
Merge branch 'master' of github.com:SprytnyZbys/Eynal
etafactory
simcivgame resources
Site updated at 2012-10-12 16:16:45 UTC
Zurb foundation updated to latest version (3.1.1)
Massive improvement of Foundation examples
switch to UNSECURED ldap connection to debug problems
change namespace from GHub to Pomm and make bundle class name just PommBundle
Moved the lat/lon/alt code into it's own code reuse subsystem in preparation for LLA mission support.
Altered the GPS origin for the LTP to be on the corner of the south-eastern dock in Santa Cruz harbor.
 * Global coordinates for missions are now mapped into the local coordinate frame on reception. This means QGC is now supported fully.
 * Fixed some indentation errors.
Renamed abovec2dm to abovegameserver
Fix for attachments with duplicate filenames, thanks to @revaxarts, fixes #15 a bit more!
Removed tab from keyDown in telnet
добавила комментарии и тесты
Renamed description field of Question
connector for jdbc added
Resolving merge conflicts
[Prakash/Tosin] - (a) Changed some test data to more realistic questions, and (b) Modified Question detail test to reflect new test data.
AccountType should not call sync as Accounts!
Implement method to change account type name.
Implement permissions into the commands.
Start actual work on set command.
stats
Merge branch 'master' of https://github.com/ThomasVyncke/Scio.git
moargoalz
choosestat
Merge branch 'master' of https://github.com/ThomasVyncke/Scio.git
changed root package name to com.ticketfly from atd
fixed config file to new server location, removed test code
added YACS license which notes that we modified the code.
LGPL implemented
Slop checking optimization
Changed issue text size and spacing
Updated white fill logo
Added firstletter class to new Issue stylesheet; updated Insider styles for firstletter
Merge branch 'master' of github.com:UCF/Pegasus-Theme
First letter style fix
Adding separate title_text and subtitle_text spans for more flexible customization
Add Folder: Questions
Merging with StoryJS CSS Core
Fix for IE date issue with prettyDate format for single and double digit years closes #131
LumberCore
Fixed one column layout
Fixed bug in expanded video player
Enable development/production mode, adopt jade